annotate src/redisplay.c @ 412:697ef44129c6 r21-2-14

Import from CVS: tag r21-2-14
author cvs
date Mon, 13 Aug 2007 11:20:41 +0200
parents de805c49cfc1
children 95016f13131a
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 /* Display generation from window structure and buffer text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 Copyright (C) 1994, 1995, 1996 Board of Trustees, University of Illinois.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 Copyright (C) 1995 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 Copyright (C) 1995, 1996 Ben Wing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 Copyright (C) 1995 Sun Microsystems, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 Copyright (C) 1996 Chuck Thompson.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 /* Synched up with: Not in FSF. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 /* Author: Chuck Thompson */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 /* Fixed up by Ben Wing for Mule */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 /* This file has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 The Golden Rules of Redisplay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 First: It Is Better To Be Correct Than Fast
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 Second: Thou Shalt Not Run Elisp From Within Redisplay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 Third: It Is Better To Be Fast Than Not To Be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 #include "lisp.h"
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
43 #include <limits.h>
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 #include "commands.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 #include "debug.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 #include "device.h"
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
49 #include "elhash.h"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 #include "extents.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 #include "faces.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 #include "frame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 #include "glyphs.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 #include "insdel.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 #include "menubar.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 #include "objects.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 #include "process.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 #include "redisplay.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 #include "toolbar.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 #include "window.h"
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
61 #include "line-number.h"
259
11cf20601dec Import from CVS: tag r20-5b28
cvs
parents: 257
diff changeset
62 #ifdef FILE_CODING
11cf20601dec Import from CVS: tag r20-5b28
cvs
parents: 257
diff changeset
63 #include "file-coding.h"
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
64 #endif
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
65
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
66 #ifdef HAVE_TTY
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
67 #include "console-tty.h"
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
68 #ifdef HAVE_UNISTD_H
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
69 #include <unistd.h> /* for isatty() */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
70 #endif
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
71 #endif /* HAVE_TTY */
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
72
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 /* Note: We have to be careful throughout this code to properly handle
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 and differentiate between Bufbytes and Emchars.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 Since strings are generally composed of Bufbytes, I've taken the tack
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 that any contiguous set of Bufbytes is called a "string", while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 any contiguous set of Emchars is called an "array". */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 /* Return value to indicate a failure by an add_*_rune routine to add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 a rune, but no propagation information needs to be returned. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 #define ADD_FAILED (prop_block_dynarr *) 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 #define BEGIN_GLYPHS 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 #define END_GLYPHS 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 #define LEFT_GLYPHS 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 #define RIGHT_GLYPHS 3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
89 /* Set the vertical clip to 0 if we are currently updating the line
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
90 start cache. Otherwise for buffers of line height 1 it may fail to
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
91 be able to work properly because regenerate_window will not layout
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
92 a single line. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 #define VERTICAL_CLIP(w, display) \
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
94 (updating_line_start_cache \
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
95 ? 0 \
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
96 : ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 ? INT_MAX \
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
98 : vertical_clip))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 /* The following structures are completely private to redisplay.c so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 we put them here instead of in a header file, for modularity. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 /* NOTE: Bytinds not Bufpos's in this structure. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 typedef struct position_redisplay_data_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 /* This information is normally filled in by the create_*_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 routines and is used by the add_*_rune routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 Emchar ch; /* Character that is to be added. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 used to communicate this information to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 add_emchar_rune(). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 Lisp_Object last_charset; /* The charset of the previous character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 Used to optimize some lookups -- we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 only have to do some things when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 the charset changes. */
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
120 face_index last_findex; /* The face index of the previous character.
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
121 Needed to ensure the validity of the
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
122 last_charset optimization. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
123
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 int last_char_width; /* The width of the previous character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 int font_is_bogus; /* If true, it means we couldn't instantiate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 the font for this charset, so we substitute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 ~'s from the ASCII charset. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 Bytind bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 Bytind bi_endpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 int pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 int max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 int blank_width; /* Width of the blank that is to be added.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 This is used to communicate this information
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 to add_blank_rune().
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 This is also used rather cheesily to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 communicate the width of the eol-cursor-size
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 blank that exists at the end of the line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 add_emchar_rune() is called cheesily with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 the non-printing char '\n', which is stuck
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 in the output routines with its width being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 BLANK_WIDTH. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 Bytind bi_cursor_bufpos;/* This stores the buffer position of the cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 unsigned int cursor_type :3;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 int cursor_x; /* rune block cursor is at */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 int start_col; /* Number of character columns (each column has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 a width of the default char width) that still
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 need to be skipped. This is used for horizontal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 scrolling, where a certain number of columns
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 (those off the left side of the screen) need
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 to be skipped before anything is displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 Bytind bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
154 int hscroll_glyph_width_adjust; /* how much the width of the hscroll
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
155 glyph differs from space_width (w).
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
156 0 if no hscroll glyph was used,
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
157 i.e. the window is not scrolled
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
158 horizontally. Used in tab
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
159 calculations. */
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
160
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 /* Information about the face the text should be displayed in and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 any begin-glyphs and end-glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 struct extent_fragment *ef;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 face_index findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 /* The height of a pixmap may either be predetermined if the user
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
167 has set a baseline value, or it may be dependent on whatever the
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
168 line ascent and descent values end up being, based just on font
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 information. In the first case we can immediately update the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 values, thus their inclusion here. In the last case we cannot
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 determine the actual contribution to the line height until we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 have finished laying out all text on the line. Thus we propagate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 the max height of such pixmaps and do a final calculation after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 all text has been added to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 int new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 int new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 int max_pixmap_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 Lisp_Object result_str; /* String where we put the result of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 generating a formatted string in the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 int is_modeline; /* Non-zero if we're generating the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 Charcount modeline_charpos; /* Number of chars used in result_str so far;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 corresponds to bytepos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 Bytecount bytepos; /* Number of bytes used in result_str so far.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 We don't actually copy the bytes into result_str
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 until the end because we don't know how big the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 string is going to be until then. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 } pos_data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 enum prop_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 PROP_STRING,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 PROP_CHAR,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 PROP_MINIBUF_PROMPT,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 PROP_BLANK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 /* Data that should be propagated to the next line. Either a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 Emchar or a string of Bufbyte's.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 The actual data that is propagated ends up as a Dynarr of these
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 blocks.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 #### It's unclean that both Emchars and Bufbytes are here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
207 typedef struct prop_block prop_block;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 struct prop_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 enum prop_type type;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
211
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 union data
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
213 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
214 struct
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
215 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
216 Bufbyte *str;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
217 Bytecount len; /* length of the string. */
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
218 } p_string;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
219
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
220 struct
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
221 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
222 Emchar ch;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
223 Bytind bi_cursor_bufpos; /* NOTE: is in Bytinds */
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
224 unsigned int cursor_type :3;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
225 } p_char;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
226
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
227 struct
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
228 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
229 int width;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
230 face_index findex;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
231 } p_blank;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
232 } data;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
235 typedef struct
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
237 Dynarr_declare (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 } prop_block_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
241 static void generate_formatted_string_db (Lisp_Object format_str,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
242 Lisp_Object result_str,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
243 struct window *w,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
244 struct display_line *dl,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
245 struct display_block *db,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
246 face_index findex, int min_pixpos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
247 int max_pixpos, int type);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 Charcount pos, Charcount min_pos,
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
250 Charcount max_pos, Lisp_Object elt,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 int depth, int max_pixsize,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
252 face_index findex, int type);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 static prop_block_dynarr *add_glyph_rune (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 struct glyph_block *gb,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 int pos_type, int allow_cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 struct glyph_cachel *cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 static Bytind create_text_block (struct window *w, struct display_line *dl,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
258 Bytind bi_start_pos, int start_col,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
259 prop_block_dynarr **prop,
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
260 int type);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 static int create_overlay_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 static void create_left_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 int overlay_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 static void create_right_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 static void redisplay_windows (Lisp_Object window, int skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 static void decode_mode_spec (struct window *w, Emchar spec, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 static void free_display_line (struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 static void update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 Bufpos point, int no_regen);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
273 static int point_visible (struct window *w, Bufpos point, int type);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 /* This used to be 10 but 30 seems to give much better performance. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 #define INIT_MAX_PREEMPTS 30
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 static int max_preempts;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
279 #define REDISPLAY_PREEMPTION_CHECK \
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
280 ((void) \
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
281 (preempted = \
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
282 (!disable_preemption && \
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
283 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
284 (!INTERACTIVE || detect_input_pending ()))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 * Redisplay global variables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 /* We need a third set of display structures for the cursor motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 routines. We used to just give each window a third set. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 we always fully regenerate the structures when needed so there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 isn't any reason we need more than a single set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 display_line_dynarr *cmotion_display_lines;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
296 /* Used by generate_formatted_string. Global because they get used so
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
297 much that the dynamic allocation time adds up. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
298 Emchar_dynarr *formatted_string_emchar_dynarr;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
299 struct display_line formatted_string_display_line;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 /* We store the extents that we need to generate in a Dynarr and then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 frob them all on at the end of generating the string. We do it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 this way rather than adding them as we generate the string because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 we don't store the text into the resulting string until we're done
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 (to avoid having to resize the string multiple times), and we don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 want to go around adding extents to a string when the extents might
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 stretch off the end of the string. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
307 EXTENT_dynarr *formatted_string_extent_dynarr;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
308 Bytecount_dynarr *formatted_string_extent_start_dynarr;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
309 Bytecount_dynarr *formatted_string_extent_end_dynarr;
0
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 /* #### probably temporary */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 int cache_adjustment;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 /* This holds a string representing the text corresponding to a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 modeline % spec. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
317 static Bufbyte_dynarr *mode_spec_bufbyte_string;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 int in_display; /* 1 if in redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 int disable_preemption; /* Used for debugging redisplay and for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 force-redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 /* We only allow max_preempts preemptions before we force a redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 static int preemption_count;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 /* Minimum pixel height of clipped bottom display line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 int vertical_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 /* Minimum visible pixel width of clipped glyphs at right margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 int horizontal_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
333 /* Set if currently inside update_line_start_cache. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
334 int updating_line_start_cache;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
335
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 /* Nonzero means reading single-character input with prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 so put cursor on minibuffer after the prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 int cursor_in_echo_area;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 Lisp_Object Qcursor_in_echo_area;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 /* Nonzero means truncate lines in all windows less wide than the frame */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 int truncate_partial_width_windows;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 /* non-nil if a buffer has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 int buffers_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 int buffers_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 /* non-nil if hscroll has changed somewhere or a buffer has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 narrowed or widened */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 int clip_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 int clip_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 /* non-nil if any extent has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 int extents_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 int extents_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 /* non-nil if any face has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 int faces_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 /* Nonzero means some frames have been marked as garbaged */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 int frame_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
363 /* non-zero if any of the builtin display glyphs (continuation,
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
364 hscroll, control-arrow, etc) is in need of updating
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
365 somewhere. */
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
366 int glyphs_changed;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
367 int glyphs_changed_set;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
368
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
369 /* non-zero if any displayed subwindow is in need of updating
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
370 somewhere. */
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
371 int subwindows_changed;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
372 int subwindows_changed_set;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
373
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
374 /* This variable is 1 if the icon has to be updated.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 It is set to 1 when `frame-icon-glyph' changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 int icon_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 int icon_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
379 /* This variable is 1 if the menubar widget has to be updated.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 It is set to 1 by set-menubar-dirty-flag and cleared when the widget
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
381 has been updated. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 int menubar_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 int menubar_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 /* true iff we should redraw the modelines on the next redisplay */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 int modeline_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 int modeline_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 /* non-nil if point has changed in some buffer since the last time
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 int point_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 int point_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 /* non-nil if some frame has changed its size */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 int size_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 /* non-nil if some device has signaled that it wants to change size */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 int asynch_device_change_pending;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 /* non-nil if any toolbar has changed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 int toolbar_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 int toolbar_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 /* non-nil if any window has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 int windows_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
407 /* non-nil if any frame's window structure has changed since the last
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 int windows_structure_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 /* If non-nil, use vertical bar cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 Lisp_Object Vbar_cursor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 Lisp_Object Qbar_cursor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
415
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
416 int visible_bell; /* If true and the terminal will support it
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
417 then the frame will flash instead of
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
418 beeping when an error occurs */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 /* Nonzero means no need to redraw the entire frame on resuming
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 a suspended Emacs. This is useful on terminals with multiple pages,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 where one page is used for Emacs and another for all else. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 int no_redraw_on_reenter;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 under which emacs is running
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 ('x is the only current possibility) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 Lisp_Object Vinitial_window_system;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 Lisp_Object Vglobal_mode_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
432 /* The number of lines scroll a window by when point leaves the window; if
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 it is <=0 then point is centered in the window */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 int scroll_step;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
436 /* Scroll up to this many lines, to bring point back on screen. */
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
437 int scroll_conservatively;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
438
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 /* Marker for where to display an arrow on top of the buffer text. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 Lisp_Object Voverlay_arrow_position;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 /* String to display for the arrow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 Lisp_Object Voverlay_arrow_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 Lisp_Object Vwindow_size_change_functions;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
445 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 #define INHIBIT_REDISPLAY_HOOKS /* #### Until we've thought about
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 this more. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 /* #### Chuck says: I think this needs more thought.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 Think about this for 19.14. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
455 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
457 int last_display_warning_tick, display_warning_tick;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 Lisp_Object Qdisplay_warning_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 int inhibit_warning_display;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 Lisp_Object Vleft_margin_width, Vright_margin_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 Lisp_Object Vtext_cursor_visible_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
466 int column_number_start_at_one;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 /* low-level interfaces onto device routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 redisplay_text_width_emchar_string (struct window *w, int findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 Emchar *str, Charcount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 unsigned char charsets[NUM_LEADING_BYTES];
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
479 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 find_charsets_in_emchar_string (charsets, str, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 charsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 249
diff changeset
486 text_width, (XFRAME (WINDOW_FRAME (w)),
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 249
diff changeset
487 WINDOW_FACE_CACHEL (w, findex), str, len));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
490 static Emchar_dynarr *rtw_emchar_dynarr;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 redisplay_text_width_string (struct window *w, int findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 Bytecount offset, Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 if (!rtw_emchar_dynarr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 rtw_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 Dynarr_reset (rtw_emchar_dynarr);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
500
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 fixup_internal_substring (nonreloc, reloc, offset, &len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 if (STRINGP (reloc))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
503 nonreloc = XSTRING_DATA (reloc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 return redisplay_text_width_emchar_string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 (w, findex, Dynarr_atp (rtw_emchar_dynarr, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 Dynarr_length (rtw_emchar_dynarr));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 Bytecount offset, Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 unsigned char charsets[NUM_LEADING_BYTES];
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
516 Lisp_Object frame;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 struct face_cachel cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 if (!rtw_emchar_dynarr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 rtw_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 Dynarr_reset (rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 fixup_internal_substring (nonreloc, reloc, offset, &len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 if (STRINGP (reloc))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
525 nonreloc = XSTRING_DATA (reloc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 find_charsets_in_bufbyte_string (charsets, nonreloc, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 reset_face_cachel (&cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 cachel.face = face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 XSETFRAME (frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 ensure_face_cachel_complete (&cachel, frame, charsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 249
diff changeset
533 text_width, (f, &cachel, Dynarr_atp (rtw_emchar_dynarr, 0),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 Dynarr_length (rtw_emchar_dynarr)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 /* Return the display block from DL of the given TYPE. A display line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 can have only one display block of each possible type. If DL does
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 not have a block of type TYPE, one will be created and added to DL. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 struct display_block *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 get_display_block_from_line (struct display_line *dl, enum display_type type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 struct display_block db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 /* Check if this display line already has a block of the desired type and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 if so, return it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 if (Dynarr_at (dl->display_blocks, elt).type == type)
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
554 return Dynarr_atp (dl->display_blocks, elt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 /* There isn't an active block of the desired type, but there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 might still be allocated blocks we need to reuse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 if (elt < Dynarr_largest (dl->display_blocks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 /* 'add' the block to the list */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 Dynarr_increment (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 /* initialize and return */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 dbp->type = type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 return dbp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 /* This line doesn't have any display blocks, so initialize the display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 bock array. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
575 dl->display_blocks = Dynarr_new (display_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 /* The line doesn't have a block of the desired type so go ahead and create
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 one and add it to the line. */
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
580 xzero (db);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 db.type = type;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
582 db.runes = Dynarr_new (rune);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 Dynarr_add (dl->display_blocks, db);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 /* Return the newly added display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 elt = Dynarr_length (dl->display_blocks) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 return Dynarr_atp (dl->display_blocks, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 tab_char_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 int char_tab_width = XINT (b->tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 return char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 space_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 /* While tabs are traditional composed of spaces, for variable-width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 fonts the space character tends to give too narrow a value. So
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 we use 'n' instead. Except that we don't. We use the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 character width for the default face. If this is actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 defined by the font then it is probably the best thing to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 actually use. If it isn't, we have assumed it is 'n' and have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 already calculated its width. Thus we can avoid a call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 XTextWidth on X frames by just querying the default width. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 return XFONT_INSTANCE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 tab_pix_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
620 return space_width (w) * tab_char_width (w);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 /* Given a pixel position in a window, return the pixel location of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 the next tabstop. Tabs are calculated from the left window edge in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 terms of spaces displayed in the default face. Formerly the space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 width was determined using the currently active face. That method
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 leads to tabstops which do not line up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 int n_pos = left_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 int pix_tab_width = tab_pix_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 /* Adjust n_pos for any hscrolling which has happened. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
636 if (w->hscroll > 1)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
637 n_pos -= space_width (w) * (w->hscroll - 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 while (n_pos <= start_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 n_pos += pix_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 return n_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 /* For the given window, calculate the outside and margin boundaries for a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 display line. The whitespace boundaries must be calculated by the text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 layout routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 layout_bounds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 calculate_display_line_boundaries (struct window *w, int modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 layout_bounds bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 /* Set the outermost boundaries which are the boundaries of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 window itself minus the gutters (and minus the scrollbars if this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 is for the modeline). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 if (!modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 bounds.left_out = WINDOW_TEXT_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 bounds.right_out = WINDOW_TEXT_RIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 bounds.left_out = WINDOW_MODELINE_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 /* The inner boundaries mark where the glyph margins are located. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 bounds.left_in = bounds.left_out + window_left_margin_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 bounds.right_in = bounds.right_out - window_right_margin_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 /* We cannot fully calculate the whitespace boundaries as they
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 depend on the contents of the line being displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 bounds.left_white = bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 bounds.right_white = bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 return bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 /* Given a display line and a starting position, ensure that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 contents of the display line accurately represent the visual
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 representation of the buffer contents starting from the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 position when displayed in the given window. The display line ends
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 when the contents of the line reach the right boundary of the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 generate_display_line (struct window *w, struct display_line *dl, int bounds,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
689 Bufpos start_pos, int start_col,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
690 prop_block_dynarr **prop,
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
691 int type)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 Bufpos ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 int overlay_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 /* If our caller hasn't already set the boundaries, then do so now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 if (!bounds)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 dl->bounds = calculate_display_line_boundaries (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 /* Reset what this line is using. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 Dynarr_reset (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 if (dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 Dynarr_free (dl->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 dl->left_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 if (dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 Dynarr_free (dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 dl->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 /* We aren't generating a modeline at the moment. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 dl->modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 /* Create a display block for the text region of the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 /* #### urk urk urk!!! Chuck fix this shit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 Bytind hacked_up_bytind =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 create_text_block (w, dl, bufpos_to_bytind (b, start_pos),
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
723 start_col, prop, type);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 if (hacked_up_bytind > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 ret_bufpos = BUF_ZV (b) + 1;
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 ret_bufpos = bytind_to_bufpos (b, hacked_up_bytind);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 dl->bufpos = start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 if (dl->end_bufpos < dl->bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 dl->end_bufpos = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 if (MARKERP (Voverlay_arrow_position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 && start_pos == marker_position (Voverlay_arrow_position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 && (STRINGP (Voverlay_arrow_string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 || GLYPHP (Voverlay_arrow_string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 overlay_width = create_overlay_glyph_block (w, dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 overlay_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 /* If there are left glyphs associated with any character in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 text block, then create a display block to handle them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 create_left_glyph_block (w, dl, overlay_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 /* If there are right glyphs associated with any character in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 text block, then create a display block to handle them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752 create_right_glyph_block (w, dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 /* In the future additional types of display blocks may be generated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 w->last_redisplay_pos = ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759 return ret_bufpos;
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 /* Adds an hscroll glyph to a display block. If this is called, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 the block had better be empty.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 Yes, there are multiple places where this function is called but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 that is the way it has to be. Each calling function has to deal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 with bi_start_col_enabled a little differently depending on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 object being worked with. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 add_hscroll_rune (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 Bytind bi_old_bufpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 if (data->cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 && data->bi_cursor_bufpos >= data->bi_start_col_enabled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 && data->bi_cursor_bufpos <= data->bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 data->bi_cursor_bufpos = data->bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 data->bi_endpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 data->bi_bufpos = data->bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 gb.glyph = Vhscroll_glyph;
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
795 {
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
796 int oldpixpos = data->pixpos;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
797 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
798 GLYPH_CACHEL (XWINDOW (data->window),
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
799 HSCROLL_GLYPH_INDEX));
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
800 data->hscroll_glyph_width_adjust =
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
801 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
802 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 data->bi_endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 data->bi_bufpos = bi_old_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 data->bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 /* Adds a character rune to a display block. If there is not enough
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 room to fit the rune on the display block (as determined by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 MAX_PIXPOS) then it adds nothing and returns ADD_FAILED. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 add_emchar_rune (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 struct rune rb, *crb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 int width, local;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 return add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 if (data->ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 data->font_is_bogus = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 /* Cheesy end-of-line pseudo-character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 Lisp_Object charset = CHAR_CHARSET (data->ch);
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
844 if (!EQ (charset, data->last_charset) ||
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
845 data->findex != data->last_findex)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 /* OK, we need to do things the hard way. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 struct window *w = XWINDOW (data->window);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
849 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 Lisp_Object font_instance =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 ensure_face_cachel_contains_charset (cachel, data->window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 charset);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
853 struct Lisp_Font_Instance *fi;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 if (EQ (font_instance, Vthe_null_font_instance))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 data->font_is_bogus = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 data->font_is_bogus = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 fi = XFONT_INSTANCE (font_instance);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 if (!fi->proportional_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 /* sweetness and light. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 data->last_char_width = fi->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 data->last_char_width = -1;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
869 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 data->new_descent = max (data->new_descent, (int) fi->descent);
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
871 data->last_charset = charset;
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
872 data->last_findex = data->findex;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 width = data->last_char_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 if (width < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 /* bummer. Proportional fonts. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 width = redisplay_text_width_emchar_string (XWINDOW (data->window),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 data->findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 &data->ch, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 local = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 crb = &rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 local = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 crb->findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 crb->xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 crb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 if (data->bi_bufpos)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
905 crb->bufpos =
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
906 bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
907 data->bi_bufpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 else if (data->is_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 crb->bufpos = data->modeline_charpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 else
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
911 /* fuckme if this shouldn't be an abort. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
912 /* abort (); fuckme harder, this abort gets tripped quite often,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
913 in propagation and whatnot. #### fixme */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 crb->bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 crb->type = RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 crb->endpos = 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 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 crb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 crb->cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 crb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 else if (data->cursor_type == IGNORE_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 crb->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 crb->cursor_type = CURSOR_OFF;
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 (local)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 Dynarr_add (data->db->runes, *crb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 Dynarr_increment (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 data->pixpos += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 /* Given a string C_STRING of length C_LENGTH, call add_emchar_rune
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 for each character in the string. Propagate any left-over data
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 unless NO_PROP is non-zero. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 add_bufbyte_string_runes (pos_data *data, Bufbyte *c_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 Bytecount c_length, int no_prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 Bufbyte *pos, *end = c_string + c_length;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 /* #### This function is too simplistic. It needs to do the same
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 sort of character interpretation (display-table lookup,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 ctl-arrow checking), etc. that create_text_block() does.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 The functionality to do this in that routine needs to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 modularized. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
966
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 for (pos = c_string; pos < end;)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 data->ch = charptr_emchar (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 if (no_prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 Bytecount len = end - pos;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
981 prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 pb.type = PROP_STRING;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
984 pb.data.p_string.str = xnew_array (Bufbyte, len);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 pb.data.p_string.len = len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 INC_CHARPTR (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 assert (pos <= end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 /* Add a single rune of the specified width. The area covered by this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 rune will be displayed in the foreground color of the associated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 /* If data->start_col is not 0 then this call to add_blank_rune must have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 been to add it as a tab. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 /* assert (w != NULL) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 /* If we have still not fully scrolled horizontally, subtract
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 the width of this tab and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 if (char_tab_width < data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 data->start_col -= char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 else if (char_tab_width == data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 data->blank_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 int spcwid = space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 if (spcwid >= data->blank_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 data->blank_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 data->blank_width -= spcwid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
1033
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 data->start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 /* Could be caused by the handling of the hscroll rune. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 if (retval != NULL || !data->blank_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 /* Blank runes are always calculated to fit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 assert (data->pixpos + data->blank_width <= data->max_pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 rb.findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 rb.xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 rb.width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 if (data->bi_bufpos)
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1049 rb.bufpos =
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1050 bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1051 data->bi_bufpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 /* #### and this is really correct too? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 rb.bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 rb.type = RUNE_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 Dynarr_add (data->db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 data->pixpos += data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 /* Add runes representing a character in octal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 if (add_failed || (add_failed = add_emchar_rune (data))) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 struct prop_block pb; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 if (!prop) \
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1091 prop = Dynarr_new (prop_block); \
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 pb.type = PROP_CHAR; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 pb.data.p_char.ch = data->ch; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 pb.data.p_char.cursor_type = data->cursor_type; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 Dynarr_add (prop, pb); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 add_octal_runes (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 prop_block_dynarr *prop, *add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 Emchar orig_char = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 unsigned int orig_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 /* Initialize */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 add_failed = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 if (!data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 add_failed = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 gb.glyph = Voctal_escape_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 add_failed =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 /* We only propagate information if the glyph was partially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 added. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 return add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 if (data->ch >= 0x100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142 /* If the character is an extended Mule character, it could have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 up to 19 bits. For the moment, we treat it as a seven-digit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 octal number. This is not that pretty, but whatever. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145 data->ch = (7 & (orig_char >> 18)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 data->ch = (7 & (orig_char >> 15)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 data->ch = (7 & (orig_char >> 12)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 data->ch = (7 & (orig_char >> 9)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 data->ch = (7 & (orig_char >> 6)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 data->ch = (7 & (orig_char >> 3)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 data->ch = (7 & orig_char) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 data->cursor_type = orig_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 #undef ADD_NEXT_OCTAL_RUNE_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 /* Add runes representing a control character to a display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 add_control_char_runes (pos_data *data, struct buffer *b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 if (!NILP (b->ctl_arrow))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 Emchar orig_char = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 /* Initialize */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 if (!data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197 if (retval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 gb.glyph = Vcontrol_arrow_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 /* We only propagate information if the glyph was partially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 added. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 if (orig_char == 0177)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 data->ch = '?';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 data->ch = orig_char ^ 0100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 if (add_emchar_rune (data))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 if (!prop)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1226 prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 pb.type = PROP_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 pb.data.p_char.ch = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 pb.data.p_char.cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 return add_octal_runes (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 static prop_block_dynarr *
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1244 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1248 if (STRINGP (entry))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 prop = add_bufbyte_string_runes (data,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1251 XSTRING_DATA (entry),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1252 XSTRING_LENGTH (entry),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 else if (GLYPHP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 if (!data->start_col && data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 prop = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 gb.glyph = entry;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 else if (CHAR_OR_CHAR_INTP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 data->ch = XCHAR_OR_CHAR_INT (entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277 }
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1278 else if (CONSP (entry))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1279 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1280 if (EQ (XCAR (entry), Qformat)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1281 && CONSP (XCDR (entry))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1282 && STRINGP (XCAR (XCDR (entry))))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1283 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1284 Lisp_Object format = XCAR (XCDR (entry));
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1285 Bytind len = XSTRING_LENGTH (format);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1286 Bufbyte *src = XSTRING_DATA (format), *end = src + len;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1287 Bufbyte *result = alloca_array (Bufbyte, len);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1288 Bufbyte *dst = result;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1289
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1290 while (src < end)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1291 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1292 Emchar c = charptr_emchar (src);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1293 INC_CHARPTR (src);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1294 if (c != '%' || src == end)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1295 dst += set_charptr_emchar (dst, c);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1296 else
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1297 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1298 c = charptr_emchar (src);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1299 INC_CHARPTR (src);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1300 switch (c)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1301 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1302 /*case 'x':
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1303 dst += long_to_string_base ((char *)dst, data->ch, 16);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1304 break;*/
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1305 case '%':
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1306 dst += set_charptr_emchar (dst, '%');
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1307 break;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1308 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1309 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1310 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1311 prop = add_bufbyte_string_runes (data, result, dst - result, 0);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1312 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1313 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 /* Else blow it off because someone added a bad entry and we don't
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1316 have any safe way of signaling an error. */
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1317 return prop;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1318 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1319
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1320 /* Given a display table entry, call the appropriate functions to
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1321 display each element of the entry. */
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 static prop_block_dynarr *
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1324 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1325 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1326 prop_block_dynarr *prop = NULL;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1327 if (VECTORP (entry))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1328 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1329 struct Lisp_Vector *de = XVECTOR (entry);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1330 EMACS_INT len = vector_length (de);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1331 int elt;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1332
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1333 for (elt = 0; elt < len; elt++)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1334 {
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1335 if (NILP (vector_data (de)[elt]))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1336 continue;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1337 else
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1338 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1339 /* Else blow it off because someone added a bad entry and we
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1340 don't have any safe way of signaling an error. Hey, this
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1341 comment sounds familiar. */
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1342
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1343 /* #### Still need to add any remaining elements to the
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1344 propagation information. */
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1345 if (prop)
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1346 return prop;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1347 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1348 }
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1349 else
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1350 prop = add_disp_table_entry_runes_1 (data, entry);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 /* Add runes which were propagated from the previous line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 /* #### Remember to handle start_col parameter of data when the rest of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 this is finished. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 /* #### Chuck -- I've redone this function a bit. It looked like the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 case of not all the propagation blocks being added was not handled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 well. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 /* #### Chuck -- I also think the double indirection of PROP is kind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 of bogus. A cleaner solution is just to check for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 Dynarr_length (prop) > 0. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 /* #### This function also doesn't even pay attention to ADD_FAILED!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 This is seriously fucked! Seven ####'s in 130 lines -- is that a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 record? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 prop_block_dynarr *add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 for (elt = 0; elt < Dynarr_length (*prop); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 struct prop_block *pb = Dynarr_atp (*prop, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 switch (pb->type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 case PROP_CHAR:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 data->ch = pb->data.p_char.ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 data->bi_cursor_bufpos = pb->data.p_char.bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 data->cursor_type = pb->data.p_char.cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 add_failed = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 case PROP_STRING:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391 if (pb->data.p_string.str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 xfree (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 /* #### bogus bogus -- this doesn't do anything!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 Should probably call add_bufbyte_string_runes(),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395 once that function is fixed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 case PROP_MINIBUF_PROMPT:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 Bytind bi_old_bufpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402 data->findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 data->bi_bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 while (pb->data.p_string.len > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 data->ch = charptr_emchar (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409 add_failed = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 data->bi_bufpos = bi_old_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 /* Complicated equivalent of ptr++, len-- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 Bufbyte *oldpos = pb->data.p_string.str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 INC_CHARPTR (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 /* ##### FIXME FIXME FIXME -- Upon successful return from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 this function, data->bi_bufpos is automatically incremented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429 However, we don't want that to happen if we were adding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 the minibuffer prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 struct buffer *buf =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 /* #### Chuck fix this shit or I'm gonna scream! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 if (bi_old_bufpos > BI_BUF_BEGV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 data->bi_bufpos = prev_bytind (buf, bi_old_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 /* #### is this correct? Does anyone know?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 Does anyone care? Is this a cheesy hack or what? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 data->bi_bufpos = BI_BUF_BEGV (buf) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 case PROP_BLANK:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 /* #### I think it's unnecessary and misleading to preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 the blank_width, as it implies that the value carries
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 over from one rune to the next, which is wrong. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 int old_width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 data->findex = pb->data.p_blank.findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 data->blank_width = pb->data.p_blank.width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 data->bi_cursor_bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 if (data->pixpos + data->blank_width > data->max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 data->blank_width = data->max_pixpos - data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 /* We pass a bogus value of char_tab_width. It shouldn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 matter because unless something is really screwed up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 this call won't cause that arg to be used. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 /* This can happen in the case where we have a tab which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 is wider than the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 if (data->blank_width != pb->data.p_blank.width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 pb->data.p_blank.width -= data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 add_failed = ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 data->blank_width = old_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 default:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 oops_no_more_space:
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
1486
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489 if (elt < Dynarr_length (*prop))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 Dynarr_delete_many (*prop, 0, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 return *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501 /* Add 'text layout glyphs at position POS_TYPE that are contained to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 the display block, but add all other types to the appropriate list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503 of the display line. They will be added later by different
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 int allow_cursor, struct glyph_cachel *cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 /* A nil extent indicates a special glyph (ex. truncator). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 if (NILP (gb->extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 || (pos_type == BEGIN_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 || (pos_type == END_GLYPHS &&
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1517 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 int xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 int ascent, descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 Lisp_Object baseline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 if (cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 width = cachel->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 else
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1529 width = glyph_width (gb->glyph, Qnil, data->findex, data->window);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 if (!width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1534 if (data->start_col)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 int glyph_char_width = width / space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 /* If we still have not fully scrolled horizontally after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 taking into account the width of the glyph, subtract its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 width and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 if (glyph_char_width < data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 data->start_col -= glyph_char_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 else if (glyph_char_width == data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 xoffset = space_width (w) * data->start_col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 width -= xoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 /* #### Can this happen? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 if (width < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 data->start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 /* Could be caused by the handling of the hscroll rune. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 if (retval != NULL || !width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 if (data->pixpos + width > data->max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 /* If this is the first object we are attempting to add to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 the line then we ignore the horizontal_clip threshold.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 Otherwise we will loop until the bottom of the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574 continually failing to add this glyph because it is wider
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575 than the window. We could alternatively just completely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576 ignore the glyph and proceed from there but I think that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577 this is a better solution. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 if (Dynarr_length (data->db->runes)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579 && data->max_pixpos - data->pixpos < horizontal_clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 width = data->max_pixpos - data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 if (cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 ascent = cachel->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588 descent = cachel->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1592 ascent = glyph_ascent (gb->glyph, Qnil, data->findex, data->window);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1593 descent = glyph_descent (gb->glyph, Qnil, data->findex,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1594 data->window);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 baseline = glyph_baseline (gb->glyph, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599 if (glyph_contrib_p (gb->glyph, data->window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601 /* A pixmap that has not had a baseline explicitly set. Its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 contribution will be determined later. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 if (NILP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 data->max_pixmap_height = max (data->max_pixmap_height, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 /* A string so determine contribution normally. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 else if (EQ (baseline, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 data->new_ascent = max (data->new_ascent, ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 data->new_descent = max (data->new_descent, descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 /* A pixmap with an explicitly set baseline. We determine the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 contribution here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 else if (INTP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623 pix_ascent = height * XINT (baseline) / 100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 pix_descent = height - pix_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626 data->new_ascent = max (data->new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 data->new_descent = max (data->new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630 /* Otherwise something is screwed up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 face = glyph_face (gb->glyph, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 if (NILP (face))
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1637 rb.findex = data->findex;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638 else
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1639 rb.findex = get_builtin_face_cache_index (w, face);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1640
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 rb.xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 rb.width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 rb.bufpos = 0; /* glyphs are never "at" anywhere */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 if (data->bi_endpos)
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1645 /* #### is this necessary at all? */
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1646 rb.endpos = bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (w)),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1647 data->bi_endpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 rb.type = RUNE_DGLYPH;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1651 /* #### Ben sez: this is way bogus if the glyph is a string.
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1652 You should not make the output routines have to cope with
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1653 this. The string could contain Mule characters, or non-
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1654 printable characters, or characters to be passed through
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1655 the display table, or non-character objects (when this gets
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1656 implemented), etc. Instead, this routine here should parse
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1657 the string into a series of runes. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 rb.object.dglyph.glyph = gb->glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 rb.object.dglyph.extent = gb->extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660 rb.object.dglyph.xoffset = xoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662 if (allow_cursor)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 {
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1664 rb.bufpos = bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (w)),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1665 data->bi_bufpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 else if (data->cursor_type == IGNORE_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 rb.cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 else if (data->cursor_type == NO_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686 rb.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1693 Dynarr_add (data->db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 data->pixpos += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 if (!NILP (glyph_face (gb->glyph, data->window)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 gb->findex =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 gb->findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 if (pos_type == BEGIN_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1709 if (!data->dl->left_glyphs)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1710 data->dl->left_glyphs = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711 Dynarr_add (data->dl->left_glyphs, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 else if (pos_type == END_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 if (!data->dl->right_glyphs)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1717 data->dl->right_glyphs = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 Dynarr_add (data->dl->right_glyphs, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 abort (); /* there are no unknown types */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 return NULL; /* shut up compiler */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 /* Add all glyphs at position POS_TYPE that are contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729 data. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732 add_glyph_runes (pos_data *data, int pos_type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735 why didn't you just modify add_glyph_rune in the first place? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738 ? data->ef->begin_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 : data->ef->end_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 /* #### Add some propagation information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 Dynarr_reset (glyph_arr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 /* Given a position for a buffer in a window, ensure that the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 display line DL accurately represents the text on a line starting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 at the given position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763 NOTE NOTE NOTE NOTE: This function works with and returns Bytinds.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 You must do appropriate conversion. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766 static Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767 create_text_block (struct window *w, struct display_line *dl,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1768 Bytind bi_start_pos, int start_col,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1769 prop_block_dynarr **prop,
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1770 int type)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 pos_data data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778 /* Don't display anything in the minibuffer if this window is not on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 a selected frame. We consider all other windows to be active
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 minibuffers as it simplifies the coding. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 int active_minibuffer = (!MINI_WINDOW_P (w) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782 (f == device_selected_frame (d)) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 is_surrogate_for_selected_frame (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 int truncate_win = window_truncation_on (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 int end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 /* If the buffer's value of selective_display is an integer then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789 only lines that start with less than selective_display columns of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 space will be displayed. If selective_display is t then all text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 after a ^M is invisible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 int selective = (INTP (b->selective_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 ? XINT (b->selective_display)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
1794 : ((!NILP (b->selective_display) ? -1 : 0)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 /* The variable ctl-arrow allows the user to specify what characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 can actually be displayed and which octal should be used for.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 #### This variable should probably have some rethought done to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 #### It would also be really nice if you could specify that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 the characters come out in hex instead of in octal. Mule
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 does that by adding a ctl-hexa variable similar to ctl-arrow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 but that's bogus -- we need a more general solution. I
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 think you need to extend the concept of display tables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 into a more general conversion mechanism. Ideally you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 could specify a Lisp function that converts characters,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 but this violates the Second Golden Rule and besides would
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1809 make things way way way way slow.
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1810
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1811 So instead, we extend the display-table concept, which was
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1812 historically limited to 256-byte vectors, to one of the
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1813 following:
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1814
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1815 a) A 256-entry vector, for backward compatibility;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1816 b) char-table, mapping characters to values;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1817 c) range-table, mapping ranges of characters to values;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1818 d) a list of the above.
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1819
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1820 The (d) option allows you to specify multiple display tables
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1821 instead of just one. Each display table can specify conversions
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1822 for some characters and leave others unchanged. The way the
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1823 character gets displayed is determined by the first display table
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1824 with a binding for that character. This way, you could call a
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1825 function `enable-hex-display' that adds a hex display-table to
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1826 the list of display tables for the current buffer.
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1827
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1828 #### ...not yet implemented... Also, we extend the concept of
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1829 "mapping" to include a printf-like spec. Thus you can make all
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1830 extended characters show up as hex with a display table like
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1831 this:
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1832
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1833 #s(range-table data ((256 524288) (format "%x")))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 Since more than one display table is possible, you have
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1836 great flexibility in mapping ranges of characters. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837 Emchar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840 ? 255 : 160));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1842 Lisp_Object face_dt, window_dt;
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1843
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 /* The text display block for this display line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 /* The first time through the main loop we need to force the glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 data to be updated. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 int initial = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 /* Apparently the new extent_fragment_update returns an end position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852 equal to the position passed in if there are no more runs to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 int no_more_frags = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856 Lisp_Object synch_minibuffers_value =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
1858
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 dl->used_prop_data = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 dl->num_chars = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1862 xzero (data);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 data.ef = extent_fragment_new (w->buffer, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 /* These values are used by all of the rune addition routines. We add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 them to this structure for ease of passing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 data.db = db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872 data.bi_bufpos = bi_start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873 data.pixpos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 data.last_charset = Qunbound;
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
1875 data.last_findex = DEFAULT_INDEX;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 data.result_str = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878 /* Set the right boundary adjusting it to take into account any end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 glyph. Save the width of the end glyph for later use. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 data.max_pixpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884 end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1885 data.max_pixpos -= end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
1887 if (cursor_in_echo_area && MINI_WINDOW_P (w) && echo_area_active (f))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
1888 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
1889 data.bi_cursor_bufpos = BI_BUF_ZV (b);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
1890 data.cursor_type = CURSOR_ON;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1892 else if (MINI_WINDOW_P (w) && !active_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893 data.cursor_type = NO_CURSOR;
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1894 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1895 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1896 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1897 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 data.bi_cursor_bufpos = BI_BUF_PT (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 data.bi_cursor_bufpos = bi_marker_position (w->pointm[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 data.cursor_x = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 data.start_col = w->hscroll;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 data.bi_start_col_enabled = (w->hscroll ? bi_start_pos : 0);
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
1913 data.hscroll_glyph_width_adjust = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915 /* We regenerate the line from the very beginning. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1918 /* Why is this less than or equal and not just less than? If the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919 starting position is already equal to the maximum we can't add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 anything else, right? Wrong. We might still have a newline to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1921 add. A newline can use the room allocated for an end glyph since
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1922 if we add it we know we aren't going to be adding any end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923 glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 /* #### Chuck -- I think this condition should be while (1).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 and the begin-glyph ends exactly at the end of the window, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 end-glyph and text might not be displayed. while (1) ensures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929 that the loop terminates only when either (a) there is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1930 propagation data or (b) the end-of-line or end-of-buffer is hit.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 #### Also I think you need to ensure that the operation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933 "add begin glyphs; add end glyphs; add text" is atomic and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1934 can't get interrupted in the middle. If you run off the end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935 of the line during that operation, then you keep accumulating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 propagation data until you're done. Otherwise, if the (e.g.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937 there's a begin glyph at a particular position and attempting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 to display that glyph results in window-end being hit and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939 propagation data being generated, then the character at that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1940 position won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942 #### See also the comment after the end of this loop, below.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944 while (data.pixpos <= data.max_pixpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 && (active_minibuffer || !NILP (synch_minibuffers_value)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 /* #### This check probably should not be necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 if (data.bi_bufpos > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1950 /* #### urk! More of this lossage! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 data.bi_bufpos--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 /* If selective display was an integer and we aren't working on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 a continuation line then find the next line we are actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 supposed to display. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958 if (selective > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959 && (data.bi_bufpos == BI_BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960 || BUF_FETCH_CHAR (b, prev_bytind (b, data.bi_bufpos)) == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 data.bi_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 if (data.bi_bufpos >= BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968 data.bi_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 /* Check for face changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 if (initial || (!no_more_frags && data.bi_bufpos == data.ef->end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 /* Now compute the face and begin/end-glyph information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 data.findex =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 /* Remember that the extent-fragment routines deal in Bytind's. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980 extent_fragment_update (w, data.ef, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1982 get_display_tables (w, data.findex, &face_dt, &window_dt);
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
1983
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984 if (data.bi_bufpos == data.ef->end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985 no_more_frags = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 initial = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989 /* Determine what is next to be displayed. We first handle any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 glyphs returned by glyphs_at_bufpos. If there are no glyphs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991 display then we determine what to do based on the character at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1992 current buffer position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994 /* If the current position is covered by an invisible extent, do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995 nothing (except maybe add some ellipses).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 #### The behavior of begin and end-glyphs at the edge of an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 invisible extent should be investigated further. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999 fairly low priority though. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000 if (data.ef->invisible)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 /* #### Chuck, perhaps you could look at this code? I don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 really know what I'm doing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007 *prop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010 /* The extent fragment code only sets this when we should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011 really display the ellipses. It makes sure the ellipses
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 don't get displayed more than once in a row. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2013 if (data.ef->invisible_ellipses)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2014 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2015 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 data.ef->invisible_ellipses_already_displayed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 data.ef->invisible_ellipses = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2021 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2022 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023 /* Perhaps they shouldn't propagate if the very next thing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 is to display a newline (for compatibility with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 selective-display-ellipses)? Maybe that's too
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026 abstruse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 /* If point is in an invisible region we place it on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 next visible character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 && data.bi_bufpos == data.bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 data.cursor_type = NEXT_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 /* #### What if we we're dealing with a display table? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 if (data.start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2041 data.start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2046 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 /* If there is propagation data, then it represents the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 buffer position being displayed. Add them and advance the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 position counter. This might also add the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053 else if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055 dl->used_prop_data = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056 *prop = add_propagation_runes (prop, &data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 goto done; /* gee, a really narrow window */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 else if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 else if (data.bi_bufpos < BI_BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2063 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 data.bi_bufpos = BI_BUF_BEGV (b);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2065 else
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 /* If there are end glyphs, add them to the line. These are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070 the end glyphs for the previous run of text. We add them
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071 here rather than doing them at the end of handling the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 previous run so that glyphs at the beginning and end of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 a line are handled correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 else if (Dynarr_length (data.ef->end_glyphs) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 *prop = add_glyph_runes (&data, END_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081 /* If there are begin glyphs, add them to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089 /* If at end-of-buffer, we've already processed begin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 end-glyphs at this point and there's no text to process,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091 so we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2092 else if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 {
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
2097 Lisp_Object entry = Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098 /* Get the character at the current buffer position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
2100 if (!NILP (face_dt) || !NILP (window_dt))
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
2101 entry = display_table_entry (data.ch, face_dt, window_dt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 /* If there is a display table entry for it, hand it off to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104 add_disp_table_entry_runes and let it worry about it. */
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
2105 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106 {
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
2107 *prop = add_disp_table_entry_runes (&data, entry);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 /* Check if we have hit a newline character. If so, add a marker
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114 to the line and end this loop. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 else if (data.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 /* We aren't going to be adding an end glyph so give its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118 space back in order to make sure that the cursor can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119 fit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 if (selective > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123 && (bi_spaces_at_point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 (b, next_bytind (b, data.bi_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125 >= selective))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 if (!NILP (b->selective_display_ellipses))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138 /* Cheesy, cheesy, cheesy. We mark the end of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139 line with a special "character rune" whose width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2140 is the EOL cursor width and whose character is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141 the non-printing character '\n'. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146 /* We need to set data.bi_bufpos to the start of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147 next visible region in order to make this line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 appear to contain all of the invisible area.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149 Otherwise, the line cache won't work
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150 correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2151 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2152 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 data.bi_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156 if (data.bi_bufpos >= BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158 data.bi_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162 if (BI_BUF_FETCH_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2163 (b, prev_bytind (b, data.bi_bufpos)) == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 DEC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2169 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2170 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2172 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175 /* If the current character is ^M, and selective display is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176 enabled, then add the invisible-text-glyph if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 selective-display-ellipses is set. In any case, this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 line is done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 else if (data.ch == (('M' & 037)) && selective == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181 Bytind bi_next_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 /* Find the buffer position at the end of the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184 bi_next_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186 if (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_next_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2187 == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2188 DEC_BYTIND (b, bi_next_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190 /* If the cursor is somewhere in the elided text make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191 sure that the cursor gets drawn appropriately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2192 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2193 && (data.bi_cursor_bufpos >= data.bi_bufpos &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2194 data.bi_cursor_bufpos < bi_next_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2195 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2196 data.cursor_type = NEXT_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2197 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2198
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2199 /* We won't be adding a truncation or continuation glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2200 so give up the room allocated for them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2201 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2202
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2203 if (!NILP (b->selective_display_ellipses))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2204 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2205 /* We don't propagate anything from the invisible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2206 text glyph if it fails to fit. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2207 intentional. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2208 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2209
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2210 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2211 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2212 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2213 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2214 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2216 /* Set the buffer position to the end of the line. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2217 need to do this before potentially adding a newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2218 so that the cursor flag will get set correctly (if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2219 needed). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2220 data.bi_bufpos = bi_next_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2222 if (NILP (b->selective_display_ellipses)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2223 || data.bi_cursor_bufpos == bi_next_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2224 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2225 /* We have to at least add a newline character so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2226 that the cursor shows up properly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2227 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2228 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2229 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2230 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2231 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2232
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2233 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2234 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2235
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2236 /* This had better be a newline but doing it this way
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2237 we'll see obvious incorrect results if it isn't. No
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2238 need to abort here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2239 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2240
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2241 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2242 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2244 /* If the current character is considered to be printable, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2245 just add it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2246 else if (data.ch >= printable_min)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2247 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2248 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2249 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2250 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2251 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2252
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2253 /* If the current character is a tab, determine the next tab
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2254 starting position and add a blank rune which extends from the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2255 current pixel position to that starting position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2256 else if (data.ch == '\t')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2257 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2258 int tab_start_pixpos = data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2259 int next_tab_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2260 int char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2261 int prop_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2263 if (data.start_col > 1)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2264 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2265
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2266 next_tab_start =
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2267 next_tab_position (w, tab_start_pixpos,
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2268 dl->bounds.left_in +
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2269 data.hscroll_glyph_width_adjust);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2270 if (next_tab_start > data.max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2271 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2272 prop_width = next_tab_start - data.max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2273 next_tab_start = data.max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2274 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2275 data.blank_width = next_tab_start - data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2276 char_tab_width =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2277 (next_tab_start - tab_start_pixpos) / space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2278
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2279 *prop = add_blank_rune (&data, w, char_tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2280
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2281 /* add_blank_rune is only supposed to be called with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2282 sizes guaranteed to fit in the available space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2283 assert (!(*prop));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2284
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2285 if (prop_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2286 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2287 struct prop_block pb;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2288 *prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2289
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2290 pb.type = PROP_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2291 pb.data.p_blank.width = prop_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2292 pb.data.p_blank.findex = data.findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2293 Dynarr_add (*prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2295 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2296 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2297 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2299 /* If character is a control character, pass it off to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2300 add_control_char_runes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2301
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2302 The is_*() routines have undefined results on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2303 arguments outside of the range [-1, 255]. (This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2304 often bites people who carelessly use `char' instead
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2305 of `unsigned char'.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2306 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2307 else if (data.ch < 0x100 && iscntrl ((Bufbyte) data.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2308 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2309 *prop = add_control_char_runes (&data, b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2310
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2311 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2312 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2313 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2314
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2315 /* If the character is above the ASCII range and we have not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2316 already handled it, then print it as an octal number. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2317 else if (data.ch >= 0200)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2318 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2319 *prop = add_octal_runes (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2321 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2322 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2323 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2324
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2325 /* Assume the current character is considered to be printable,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2326 then just add it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2327 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2328 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2329 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2330 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2331 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2332 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2333
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2334 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2335 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2336 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2337
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2338 done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2339
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2340 /* Determine the starting point of the next line if we did not hit the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2341 end of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2342 if (data.bi_bufpos < BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2343 && (active_minibuffer || !NILP (synch_minibuffers_value)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2344 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2345 /* #### This check is not correct. If the line terminated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2346 due to a begin-glyph or end-glyph hitting window-end, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2347 data.ch will not point to the character at data.bi_bufpos. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2348 you make the two changes mentioned at the top of this loop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2349 you should be able to say '(if (*prop))'. That should also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2350 make it possible to eliminate the data.bi_bufpos < BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2351 check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2352
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2353 /* The common case is that the line ended because we hit a newline.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2354 In that case, the next character is just the next buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2355 position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2356 if (data.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2357 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2358 /* If data.start_col_enabled is still true, then the window is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2359 scrolled far enough so that nothing on this line is visible.
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
2360 We need to stick a truncation glyph at the beginning of the
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2361 line in that case unless the line is completely blank. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2362 if (data.bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2363 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2364 if (data.cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2365 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2366 if (data.bi_cursor_bufpos >= bi_start_pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2367 && data.bi_cursor_bufpos <= data.bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2368 data.bi_cursor_bufpos = data.bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2369 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2370 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2371 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2372 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2373
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2374 if (data.bi_bufpos != bi_start_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2375 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2376 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2378 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2379 gb.glyph = Vhscroll_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2380 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2381 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2382 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2383 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2384 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2385 /* This duplicates code down below to add a newline to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2386 the end of an otherwise empty line.*/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2387 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2388 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2390 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2391 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2392 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2393
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2394 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2395 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2396
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2397 /* Otherwise we have a buffer line which cannot fit on one display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2398 line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2399 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2400 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2401 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2402 struct glyph_cachel *cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2404 /* If the line is to be truncated then we actually have to look
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2405 for the next newline. We also add the end-of-line glyph which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2406 we know will fit because we adjusted the right border before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2407 we starting laying out the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2408 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2409 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2410 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2412 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2413 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2414 Bytind bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2415
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2416 /* Now find the start of the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2417 bi_pos = bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2419 /* If the cursor is past the truncation line then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2420 make it appear on the truncation glyph. If we've hit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2421 the end of the buffer then we also make the cursor
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
2422 appear unless eob is immediately preceded by a
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2423 newline. In that case the cursor should actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2424 appear on the next line. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2425 if (data.cursor_type == CURSOR_ON
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2426 && data.bi_cursor_bufpos >= data.bi_bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2427 && (data.bi_cursor_bufpos < bi_pos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2428 (bi_pos == BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2429 && (bi_pos == BI_BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2430 || (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2431 != '\n')))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2432 data.bi_cursor_bufpos = bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2433 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2434 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2435
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2436 data.bi_bufpos = bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2437 gb.glyph = Vtruncation_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2438 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2439 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2440 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2441 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2442 /* The cursor can never be on the continuation glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2443 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2445 /* data.bi_bufpos is already at the start of the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2447 gb.glyph = Vcontinuation_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2448 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2449 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2450
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2451 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1, cachel);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2453 if (truncate_win && data.bi_bufpos == BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2454 && BI_BUF_FETCH_CHAR (b, prev_bytind (b, BI_BUF_ZV (b))) != '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2455 /* #### Damn this losing shit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2456 data.bi_bufpos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2457 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2458 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2459 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2460 && (!echo_area_active (f) || data.bi_bufpos == BI_BUF_ZV (b)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2461 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2462 /* We need to add a marker to the end of the line since there is no
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2463 newline character in order for the cursor to get drawn. We label
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2464 it as a newline so that it gets handled correctly by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2465 whitespace routines below. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2466
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2467 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2468 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2469 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2470 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2471 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2472
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2473 data.max_pixpos += data.blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2474 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2475 data.max_pixpos -= data.blank_width;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2476
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2477 /* #### urk! Chuck, this shit is bad news. Going around
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2478 manipulating invalid positions is guaranteed to result in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2479 trouble sooner or later. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2480 data.bi_bufpos = BI_BUF_ZV (b) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2481 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2482
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2483 /* Calculate left whitespace boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2484 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2485 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2486
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2487 /* Whitespace past a newline is considered right whitespace. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2488 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2489 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2490 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2491
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2492 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2493 || rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2494 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2495 dl->bounds.left_white += rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2496 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2497 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2498 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2499 elt = Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2500 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2501 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2502
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2503 /* Calculate right whitespace boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2504 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2505 int elt = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2506 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2507
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2508 while (!done && elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2509 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2510 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2512 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2513 && isspace (rb->object.chr.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2514 && !rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2515 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2516 dl->bounds.right_white = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2517 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2518 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2519
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2520 elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2521
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2522 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2524 /* The line is blank so everything is considered to be right
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2525 whitespace. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2526 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2527 dl->bounds.right_white = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2528 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2529
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2530 /* Set the display blocks bounds. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2531 db->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2532 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2533 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2534 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2535
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2536 db->end_pos = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2537 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2538 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2539 db->end_pos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2540
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2541 /* update line height parameters */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2542 if (!data.new_ascent && !data.new_descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2543 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2544 /* We've got a blank line so initialize these values from the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2545 face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2546 default_face_font_info (data.window, &data.new_ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2547 &data.new_descent, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2548 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2549
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2550 if (data.max_pixmap_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2551 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2552 int height = data.new_ascent + data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2553 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2554
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2555 pix_descent = data.max_pixmap_height * data.new_descent / height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2556 pix_ascent = data.max_pixmap_height - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2557
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2558 data.new_ascent = max (data.new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2559 data.new_descent = max (data.new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2560 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2561
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2562 dl->ascent = data.new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2563 dl->descent = data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2564
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2565 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2566 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2567
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2568 if (dl->ascent < ascent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2569 dl->ascent = ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2570 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2571 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2572 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2573
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2574 if (dl->descent < descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2575 dl->descent = descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2576 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2577
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2578 dl->cursor_elt = data.cursor_x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2579 /* #### lossage lossage lossage! Fix this shit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2580 if (data.bi_bufpos > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2581 dl->end_bufpos = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2582 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2583 dl->end_bufpos = bytind_to_bufpos (b, data.bi_bufpos) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2584 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2585 data.dl->num_chars = column_at_point (b, dl->end_bufpos, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2586 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2587 /* This doesn't correctly take into account tabs and control
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2588 characters but if the window isn't being truncated then this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2589 value isn't going to end up being used anyhow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2590 data.dl->num_chars = dl->end_bufpos - dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2592 /* #### handle horizontally scrolled line with text none of which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2593 was actually laid out. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2595 /* #### handle any remainder of overlay arrow */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2596
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2597 if (*prop == ADD_FAILED)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2598 *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2599
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2600 if (truncate_win && *prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2601 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2602 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2603 *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2604 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2605
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2606 extent_fragment_delete (data.ef);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2607
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2608 /* #### If we started at EOB, then make sure we return a value past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2609 it so that regenerate_window will exit properly. This is bogus.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2610 The main loop should get fixed so that it isn't necessary to call
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2611 this function if we are already at EOB. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2612
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2613 if (data.bi_bufpos == BI_BUF_ZV (b) && bi_start_pos == BI_BUF_ZV (b))
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
2614 return data.bi_bufpos + 1; /* Yuck! */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2615 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2616 return data.bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2617 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2618
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2619 /* Display the overlay arrow at the beginning of the given line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2620
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2621 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2622 create_overlay_glyph_block (struct window *w, struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2623 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2624 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2625 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2626 pos_data data;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2627
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2628 /* If Voverlay_arrow_string isn't valid then just fail silently. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2629 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2630 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2631
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2632 xzero (data);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2633 data.ef = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2634 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2635 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2636 data.db = get_display_block_from_line (dl, OVERWRITE);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2637 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2638 data.pixpos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2639 data.max_pixpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2640 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2641 data.cursor_x = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2642 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2643 data.last_charset = Qunbound;
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
2644 data.last_findex = DEFAULT_INDEX;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2645 data.result_str = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2647 Dynarr_reset (data.db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2648
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2649 if (STRINGP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2650 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2651 add_bufbyte_string_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2652 (&data,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
2653 XSTRING_DATA (Voverlay_arrow_string),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
2654 XSTRING_LENGTH (Voverlay_arrow_string),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2655 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2656 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2657 else if (GLYPHP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2658 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2659 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2661 gb.glyph = Voverlay_arrow_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2662 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2663 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2664 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2665
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2666 if (data.max_pixmap_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2667 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2668 int height = data.new_ascent + data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2669 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2670
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2671 pix_descent = data.max_pixmap_height * data.new_descent / height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2672 pix_ascent = data.max_pixmap_height - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2673
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2674 data.new_ascent = max (data.new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2675 data.new_descent = max (data.new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2676 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2677
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2678 dl->ascent = data.new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2679 dl->descent = data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2680
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2681 data.db->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2682 data.db->end_pos = data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2683
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
2684 return data.pixpos - dl->bounds.left_in;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2685 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2687 /* Add a type of glyph to a margin display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2689 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2690 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2691 int count, enum glyph_layout layout, int side, Lisp_Object window)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2692 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2693 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2694 ? dl->left_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2695 : dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2696 int elt, end;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2697 int xpos = start;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2698 int reverse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2699
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2700 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2701 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2702 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2703 reverse = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2704 elt = Dynarr_length (gbd) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2705 end = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2706 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2707 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2708 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2709 reverse = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2710 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2711 end = Dynarr_length (gbd);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2712 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2713
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2714 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2715 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2716 struct glyph_block *gb = Dynarr_atp (gbd, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2717
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2718 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2719 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2720
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2721 if (gb->active &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2722 ((side == LEFT_GLYPHS &&
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2723 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2724 || (side == RIGHT_GLYPHS &&
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2725 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2726 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2727 struct rune rb;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2728
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2729 rb.width = gb->width;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2730 rb.findex = gb->findex;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2731 rb.xpos = xpos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2732 rb.bufpos = -1;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2733 rb.endpos = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2734 rb.type = RUNE_DGLYPH;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2735 rb.object.dglyph.glyph = gb->glyph;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2736 rb.object.dglyph.extent = gb->extent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2737 rb.object.dglyph.xoffset = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2738 rb.cursor_type = CURSOR_OFF;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2739
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2740 Dynarr_add (db->runes, rb);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2741 xpos += rb.width;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2742 count--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2743 gb->active = 0;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2744
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2745 if (glyph_contrib_p (gb->glyph, window))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2746 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2747 unsigned short ascent, descent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2748 Lisp_Object baseline = glyph_baseline (gb->glyph, window);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2749
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2750 ascent = glyph_ascent (gb->glyph, Qnil, gb->findex, window);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2751 descent = glyph_descent (gb->glyph, Qnil, gb->findex, window);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2752
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2753 /* A pixmap that has not had a baseline explicitly set.
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2754 We use the existing ascent / descent ratio of the
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2755 line. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2756 if (NILP (baseline))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2757 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2758 int gheight = ascent + descent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2759 int line_height = dl->ascent + dl->descent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2760 int pix_ascent, pix_descent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2761
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2762 pix_descent = (int) (gheight * dl->descent) / line_height;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2763 pix_ascent = gheight - pix_descent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2764
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2765 dl->ascent = max ((int) dl->ascent, pix_ascent);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2766 dl->descent = max ((int) dl->descent, pix_descent);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2767 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2768
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2769 /* A string so determine contribution normally. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2770 else if (EQ (baseline, Qt))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2771 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2772 dl->ascent = max (dl->ascent, ascent);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2773 dl->descent = max (dl->descent, descent);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2774 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2775
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2776 /* A pixmap with an explicitly set baseline. We determine the
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2777 contribution here. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2778 else if (INTP (baseline))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2779 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2780 int height = ascent + descent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2781 int pix_ascent, pix_descent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2782
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2783 pix_ascent = height * XINT (baseline) / 100;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2784 pix_descent = height - pix_ascent;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2785
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2786 dl->ascent = max ((int) dl->ascent, pix_ascent);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2787 dl->descent = max ((int) dl->descent, pix_descent);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2788 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2789
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2790 /* Otherwise something is screwed up. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2791 else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2792 abort ();
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2793 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2794 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2795
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2796 (reverse ? elt-- : elt++);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2797 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2798
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2799 return xpos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2800 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2802 /* Add a blank to a margin display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2803
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2804 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2805 add_margin_blank (struct display_line *dl, struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2806 struct window *w, int xpos, int width, int side)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2807 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2808 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2809
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2810 rb.findex = (side == LEFT_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2811 ? get_builtin_face_cache_index (w, Vleft_margin_face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2812 : get_builtin_face_cache_index (w, Vright_margin_face));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2813 rb.xpos = xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2814 rb.width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2815 rb.bufpos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2816 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2817 rb.type = RUNE_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2818 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2819
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2820 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2821 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2822
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2823 /* Display glyphs in the left outside margin, left inside margin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2824 left whitespace area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2825
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2826 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2827 create_left_glyph_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2828 int overlay_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2829 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2830 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2831
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2832 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2833 int elt, end_xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2834 int out_end, in_out_start, in_in_end, white_out_start, white_in_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2835 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2836 int left_in_start = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2837 int left_in_end = dl->bounds.left_in + overlay_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2839 struct display_block *odb, *idb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2840
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2841 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2842
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2843 /* We have to add the glyphs to the line in the order outside,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2844 inside, whitespace. However the precedence dictates that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2845 determine how many will fit in the reverse order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2846
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2847 /* Determine how many whitespace glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2848 they should start. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2849 white_in_start = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2850 white_out_start = left_in_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2851 white_out_cnt = white_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2852 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2854 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2855 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2856 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2858 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2859 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2860
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2861 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2862 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2863 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2864
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2865 width = glyph_width (gb->glyph, Qnil, gb->findex, window);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2867 if (white_in_start - width >= left_in_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2868 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2869 white_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2870 white_in_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2871 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2872 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2873 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2874 else if (use_overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2875 && (white_out_start - width > dl->bounds.left_out))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2876 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2877 white_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2878 white_out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2879 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2880 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2881 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2882 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2883 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2884 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2885
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2886 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2887 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2888
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2889 /* Determine how many inside margin glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2890 they should start. The inside margin glyphs get whatever space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2891 is left after the whitespace glyphs have been displayed. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2892 are tricky to calculate since if we decide to use the overflow
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
2893 area we basically have to start over. So for these we build up a
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2894 list of just the inside margin glyphs and manipulate it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2895 determine the needed info. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2896 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2897 glyph_block_dynarr *ib;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2898 int avail_in, avail_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2899 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2900 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2901 int used_in, used_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2902
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2903 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2904 used_in = used_out = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2905 ib = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2906 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2907 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2908 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2909
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2910 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2911 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2912
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2913 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2914 GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2915 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2916 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2917 used_in += gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2918 Dynarr_add (ib, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2919 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2920
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2921 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2922 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2923
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2924 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2925 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2926 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2927 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2928 avail_in = white_in_start - left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2929 if (avail_in < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2930 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2931 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2932
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2933 if (!use_overflow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2934 avail_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2935 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2936 avail_out = white_out_start - dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2937
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2938 marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2939 while (!done && marker < Dynarr_length (ib))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2940 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2941 int width = Dynarr_atp (ib, marker)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2942
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2943 /* If everything now fits in the available inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2944 space, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2945 if (used_in <= avail_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2946 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2947 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2948 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2949 /* Otherwise see if we have room to move a glyph to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2950 outside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2951 if (used_out + width <= avail_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2952 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2953 used_out += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2954 used_in -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2955 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2956 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2957 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2958 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2959
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2960 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2961 marker++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2962 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2964 /* At this point we now know that everything from marker on goes in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2965 the inside margin and everything before it goes in the outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2966 margin. The stuff going into the outside margin is guaranteed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2967 to fit, but we may have to trim some stuff from the inside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2969 in_in_end = left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2970 in_out_start = white_out_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2971 in_out_cnt = in_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2972
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2973 Dynarr_free (ib);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2974 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2975 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2976 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2977 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2978
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2979 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2980 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2982 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2983 GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2984 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
2985 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2987 if (used_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2988 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2989 in_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2990 in_out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2991 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2992 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2993 used_out -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2994 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2995 else if (in_in_end + width < white_in_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2996 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2997 in_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2998 in_in_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2999 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3000 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3001 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3002 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3003 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3004 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3005
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3006 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3007 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3008 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3009
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3010 /* Determine how many outside margin glyphs we can display. They
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3011 always start at the left outside margin and can only use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3012 outside margin space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3013 out_end = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3014 out_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3015 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3016
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3017 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3018 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3019 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3020
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3021 if (NILP (gb->extent))
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
3022 abort (); /* these should have been handled in add_glyph_rune */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3023
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3024 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3025 GL_OUTSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3026 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3027 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3028
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3029 if (out_end + width <= in_out_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3030 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3031 out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3032 out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3033 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3034 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3035 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3036 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3037 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3038 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3039
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3040 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3041 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3042
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
3043 /* Now that we know where everything goes, we add the glyphs as
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
3044 runes to the appropriate display blocks. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3045 if (out_cnt || in_out_cnt || white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3046 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3047 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3048 odb->start_pos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3049 /* #### We should stop adding a blank to account for the space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3050 between the end of the glyphs and the margin and instead set
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3051 this accordingly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3052 odb->end_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3053 Dynarr_reset (odb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3054 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3055 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3056 odb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3057
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3058 if (in_in_cnt || white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3059 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3060 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3061 idb->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3062 /* #### See above comment for odb->end_pos */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3063 idb->end_pos = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3064 Dynarr_reset (idb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3065 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3066 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3067 idb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3068
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3069 /* First add the outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3070 if (out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3071 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3072 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3073 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3074 end_xpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3075
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3076 /* There may be blank space between the outside margin glyphs and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3077 the inside margin glyphs. If so, add a blank. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3078 if (in_out_cnt && (in_out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3079 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3080 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3081 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3082 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3084 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3085 outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3086 if (in_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3087 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3088 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3089 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3090 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3091
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3092 /* If we didn't add any inside margin glyphs to the outside margin,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3093 but are adding whitespace glyphs, then we need to add a blank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3094 here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3095 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3096 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3097 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3098 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3099 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3101 /* Next add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3102 outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3103 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3104 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3105 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3106 GL_WHITESPACE, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3107 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3108
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3109 /* We take care of clearing between the end of the glyphs and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3110 start of the inside margin for lines which have glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3111 if (odb && (left_in_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3112 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3113 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3114 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3115 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3116
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3117 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3118 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3119 if (in_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3120 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3121 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3122 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3123 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3124 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3125 end_xpos = left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3126
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3127 /* Make sure that the area between the end of the inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3128 glyphs and the whitespace glyphs is cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3129 if (idb && (white_in_start - end_xpos > 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3130 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3131 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3132 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3133 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3134
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3135 /* Next add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3136 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3137 if (white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3138 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3139 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3140 LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3141 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3143 /* Whitespace glyphs always end right next to the text block so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3144 there is nothing we have to make sure is cleared after them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3145 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3146
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3147 /* Display glyphs in the right outside margin, right inside margin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3148 right whitespace area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3150 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3151 create_right_glyph_block (struct window *w, struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3152 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3153 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3155 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3156 int elt, end_xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3157 int out_start, in_out_end, in_in_start, white_out_end, white_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3158 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3159
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3160 struct display_block *odb, *idb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3162 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3163
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3164 /* We have to add the glyphs to the line in the order outside,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3165 inside, whitespace. However the precedence dictates that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3166 determine how many will fit in the reverse order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3168 /* Determine how many whitespace glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3169 they should start. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3170 white_in_end = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3171 white_out_end = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3172 white_out_cnt = white_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3173 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3174
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3175 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3176 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3177 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3179 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3180 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3182 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3183 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3184 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3186 if (white_in_end + width <= dl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3187 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3188 white_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3189 white_in_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3190 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3191 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3192 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3193 else if (use_overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3194 && (white_out_end + width <= dl->bounds.right_out))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3195 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3196 white_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3197 white_out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3198 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3199 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3200 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3201 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3202 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3203 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3204
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3205 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3206 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3208 /* Determine how many inside margin glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3209 they should start. The inside margin glyphs get whatever space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3210 is left after the whitespace glyphs have been displayed. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3211 are tricky to calculate since if we decide to use the overflow
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
3212 area we basically have to start over. So for these we build up a
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3213 list of just the inside margin glyphs and manipulate it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3214 determine the needed info. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3215 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3216 glyph_block_dynarr *ib;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3217 int avail_in, avail_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3218 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3219 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3220 int used_in, used_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3222 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3223 used_in = used_out = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
3224 ib = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3225 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3226 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3227 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3228
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3229 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3230 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3232 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3233 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3234 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3235 used_in += gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3236 Dynarr_add (ib, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3237 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3238
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3239 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3240 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3242 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3243 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3244 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3245 avail_in = dl->bounds.right_in - white_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3247 if (!use_overflow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3248 avail_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3249 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3250 avail_out = dl->bounds.right_out - white_out_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3251
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3252 marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3253 while (!done && marker < Dynarr_length (ib))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3254 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3255 int width = Dynarr_atp (ib, marker)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3256
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3257 /* If everything now fits in the available inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3258 space, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3259 if (used_in <= avail_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3260 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3261 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3262 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3263 /* Otherwise see if we have room to move a glyph to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3264 outside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3265 if (used_out + width <= avail_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3266 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3267 used_out += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3268 used_in -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3269 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3270 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3271 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3272 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3273
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3274 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3275 marker++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3276 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3278 /* At this point we now know that everything from marker on goes in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3279 the inside margin and everything before it goes in the outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3280 margin. The stuff going into the outside margin is guaranteed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3281 to fit, but we may have to trim some stuff from the inside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3282
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3283 in_in_start = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3284 in_out_end = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3285 in_out_cnt = in_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3286
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3287 Dynarr_free (ib);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3288 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3289 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3290 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3291 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3292
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3293 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3294 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3295
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3296 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3297 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3298 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3300 if (used_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3301 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3302 in_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3303 in_out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3304 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3305 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3306 used_out -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3307 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3308 else if (in_in_start - width >= white_in_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3309 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3310 in_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3311 in_in_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3312 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3313 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3314 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3315 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3316 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3317 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3319 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3320 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3321 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3323 /* Determine how many outside margin glyphs we can display. They
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3324 always start at the right outside margin and can only use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3325 outside margin space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3326 out_start = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3327 out_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3328 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3330 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3331 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3332 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3333
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3334 if (NILP (gb->extent))
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
3335 abort (); /* these should have been handled in add_glyph_rune */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3337 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3338 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3339 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3340
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3341 if (out_start - width >= in_out_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3342 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3343 out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3344 out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3345 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3346 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3347 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3348 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3349 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3350 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3351
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3352 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3353 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3355 /* Now that we now where everything goes, we add the glyphs as runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3356 to the appropriate display blocks. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3357 if (out_cnt || in_out_cnt || white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3358 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3359 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3360 /* #### See comments before odb->start_pos init in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3361 create_left_glyph_block */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3362 odb->start_pos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3363 odb->end_pos = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3364 Dynarr_reset (odb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3365 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3366 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3367 odb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3369 if (in_in_cnt || white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3370 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3371 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3372 idb->start_pos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3373 /* #### See comments before odb->start_pos init in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3374 create_left_glyph_block */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3375 idb->end_pos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3376 Dynarr_reset (idb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3377 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3378 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3379 idb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3380
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3381 /* First add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3382 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3383 if (white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3384 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3385 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3386 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3387 window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3388 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3389 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3390 end_xpos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3392 /* Make sure that the area between the end of the whitespace glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3393 and the inside margin glyphs is cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3394 if (in_in_cnt && (in_in_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3395 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3396 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3397 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3398 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3399
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3400 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3401 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3402 if (in_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3403 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3404 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3405 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3406 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3408 /* If we didn't add any inside margin glyphs then make sure the rest
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3409 of the inside margin area gets cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3410 if (idb && (dl->bounds.right_in - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3411 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3412 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3413 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3414 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3415
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3416 /* Next add any whitespace glyphs in the outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3417 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3418 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3419 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3420 GL_WHITESPACE, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3421 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3422 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3423 end_xpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3424
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3425 /* Next add any inside margin glyphs in the outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3426 if (in_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3427 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3428 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3429 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3430 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3431
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3432 /* There may be space between any whitespace or inside margin glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3433 in the outside margin and the actual outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3434 if (odb && (out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3435 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3436 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3437 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3438 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3439
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3440 /* Finally, add the outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3441 if (out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3442 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3443 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3444 RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3445 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3446 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3449 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3450 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3451 /* modeline routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3452 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3453 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3454
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3455 /* Ensure that the given display line DL accurately represents the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3456 modeline for the given window. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3457
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3458 static void
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3459 generate_modeline (struct window *w, struct display_line *dl, int type)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3460 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3461 struct buffer *b = XBUFFER (w->buffer);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3462 struct frame *f = XFRAME (w->frame);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3463 struct device *d = XDEVICE (f->device);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3464
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3465 /* Unlike display line and rune pointers, this one can't change underneath
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3466 our feet. */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3467 struct display_block *db = get_display_block_from_line (dl, TEXT);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3468 int max_pixpos, min_pixpos, ypos_adj;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3469 Lisp_Object font_inst;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3470
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3471 /* This will actually determine incorrect inside boundaries for the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3472 modeline since it ignores the margins. However being aware of this fact
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3473 we never use those values anywhere so it doesn't matter. */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3474 dl->bounds = calculate_display_line_boundaries (w, 1);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3475
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3476 /* We are generating a modeline. */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3477 dl->modeline = 1;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3478 dl->cursor_elt = -1;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3479
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3480 /* Reset the runes on the modeline. */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3481 Dynarr_reset (db->runes);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3482
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3483 if (!WINDOW_HAS_MODELINE_P (w))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3484 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3485 struct rune rb;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3486
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3487 /* If there is a horizontal scrollbar, don't add anything. */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3488 if (window_scrollbar_height (w))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3489 return;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3490
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3491 dl->ascent = DEVMETH (d, divider_height, ());
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3492 dl->descent = 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3493 /* The modeline is at the bottom of the gutters. */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3494 dl->ypos = WINDOW_BOTTOM (w);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3495
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3496 rb.findex = MODELINE_INDEX;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3497 rb.xpos = dl->bounds.left_out;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3498 rb.width = dl->bounds.right_out - dl->bounds.left_out;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3499 rb.bufpos = 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3500 rb.endpos = 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3501 rb.type = RUNE_HLINE;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3502 rb.object.hline.thickness = 1;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3503 rb.object.hline.yoffset = 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3504 rb.cursor_type = NO_CURSOR;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3505
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3506 if (!EQ (Qzero, w->modeline_shadow_thickness)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3507 && FRAME_WIN_P (f))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3508 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3509 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3510
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3511 dl->ypos -= shadow_thickness;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3512 rb.xpos += shadow_thickness;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3513 rb.width -= 2 * shadow_thickness;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3514 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3515
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3516 Dynarr_add (db->runes, rb);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3517 return;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3518 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3519
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3520 /* !!#### not right; needs to compute the max height of
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3521 all the charsets */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3522 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3523
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3524 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3525 dl->descent = XFONT_INSTANCE (font_inst)->descent;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3526
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3527 min_pixpos = dl->bounds.left_out;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3528 max_pixpos = dl->bounds.right_out;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3529
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3530 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3531 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3532 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3533
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3534 ypos_adj = shadow_thickness;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3535 min_pixpos += shadow_thickness;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3536 max_pixpos -= shadow_thickness;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3537 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3538 else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3539 ypos_adj = 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3540
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3541 generate_formatted_string_db (b->modeline_format,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3542 b->generated_modeline_string, w, dl, db,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3543 MODELINE_INDEX, min_pixpos, max_pixpos, type);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3544
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3545 /* The modeline is at the bottom of the gutters. We have to wait to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3546 set this until we've generated the modeline in order to account
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3547 for any embedded faces. */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3548 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3549 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3550
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3551 static void
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3552 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3553 struct window *w, struct display_line *dl,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3554 struct display_block *db, face_index findex,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3555 int min_pixpos, int max_pixpos, int type)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3556 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3557 struct frame *f = XFRAME (w->frame);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3558 struct device *d = XDEVICE (f->device);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3559
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3560 pos_data data;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3561 int c_pixpos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3562
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3563 xzero (data);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3564 data.d = d;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3565 data.db = db;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3566 data.dl = dl;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3567 data.findex = findex;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3568 data.pixpos = min_pixpos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3569 data.max_pixpos = max_pixpos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3570 data.cursor_type = NO_CURSOR;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3571 data.last_charset = Qunbound;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3572 data.last_findex = DEFAULT_INDEX;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3573 data.result_str = result_str;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3574 data.is_modeline = 1;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3575 XSETWINDOW (data.window, w);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3576
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3577 Dynarr_reset (formatted_string_extent_dynarr);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3578 Dynarr_reset (formatted_string_extent_start_dynarr);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3579 Dynarr_reset (formatted_string_extent_end_dynarr);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3580
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3581 /* This recursively builds up the modeline. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3582 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3583 max_pixpos - min_pixpos, findex, type);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3584
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3585 if (Dynarr_length (db->runes))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3586 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3587 struct rune *rb =
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3588 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3589 c_pixpos = rb->xpos + rb->width;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3590 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3591 else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3592 c_pixpos = min_pixpos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3593
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3594 /* If we don't reach the right side of the window, add a blank rune
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3595 to make up the difference. This usually only occurs if the
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3596 modeline face is using a proportional width font or a fixed width
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3597 font of a different size from the default face font. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3598
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3599 if (c_pixpos < max_pixpos)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3600 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3601 data.pixpos = c_pixpos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3602 data.blank_width = max_pixpos - data.pixpos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3603
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3604 add_blank_rune (&data, NULL, 0);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3605 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3606
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3607 /* Now create the result string and frob the extents into it. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3608 if (!NILP (result_str))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3609 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3610 int elt;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3611 Bytecount len;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3612 Bufbyte *strdata;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3613 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3614
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3615 detach_all_extents (result_str);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3616 resize_string (XSTRING (result_str), -1,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3617 data.bytepos - XSTRING_LENGTH (result_str));
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3618
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3619 strdata = XSTRING_DATA (result_str);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3620
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3621 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3622 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3623 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3624 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3625 len += (set_charptr_emchar
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3626 (strdata + len, Dynarr_atp (db->runes,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3627 elt)->object.chr.ch));
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3628 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3629 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3630
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3631 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3632 elt++)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3633 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3634 Lisp_Object extent = Qnil;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3635 Lisp_Object child;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3636
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3637 XSETEXTENT (extent, Dynarr_at (formatted_string_extent_dynarr, elt));
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3638 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3639 if (NILP (child))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3640 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3641 child = Fmake_extent (Qnil, Qnil, result_str);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3642 Fputhash (extent, child, buf->modeline_extent_table);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3643 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3644 Fset_extent_parent (child, extent);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3645 set_extent_endpoints
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3646 (XEXTENT (child),
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3647 Dynarr_at (formatted_string_extent_start_dynarr, elt),
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3648 Dynarr_at (formatted_string_extent_end_dynarr, elt),
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3649 result_str);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3650 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3651 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3652 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3653
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3654 static Charcount
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3655 add_string_to_fstring_db_runes (pos_data *data, CONST Bufbyte *str,
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3656 Charcount pos, Charcount min_pos, Charcount max_pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3657 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3658 /* This function has been Mule-ized. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3659 Charcount end;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3660 CONST Bufbyte *cur_pos = str;
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3661 struct display_block *db = data->db;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3662
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3663 data->blank_width = space_width (XWINDOW (data->window));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3664 while (Dynarr_length (db->runes) < pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3665 add_blank_rune (data, NULL, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3666
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3667 end = (Dynarr_length (db->runes) +
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3668 bytecount_to_charcount (str, strlen ((CONST char *) str)));
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3669 if (max_pos != -1)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3670 end = min (max_pos, end);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3671
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3672 while (pos < end && *cur_pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3673 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3674 CONST Bufbyte *old_cur_pos = cur_pos;
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3675 int succeeded;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3676
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3677 data->ch = charptr_emchar (cur_pos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3678 succeeded = (add_emchar_rune (data) != ADD_FAILED);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3679 INC_CHARPTR (cur_pos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3680 if (succeeded)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3681 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3682 pos++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3683 data->modeline_charpos++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3684 data->bytepos += cur_pos - old_cur_pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3685 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3686 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3687
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3688 while (Dynarr_length (db->runes) < min_pos &&
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3689 (data->pixpos + data->blank_width <= data->max_pixpos))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3690 add_blank_rune (data, NULL, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3691
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3692 return Dynarr_length (db->runes);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3693 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3694
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3695 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3696 modeline extents. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3697 static Charcount
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3698 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3699 Charcount pos, Charcount min_pos, Charcount max_pos)
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3700 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3701 /* This function has been Mule-ized. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3702 Charcount end;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3703 struct display_block *db = data->db;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3704 struct glyph_block gb;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3705
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3706 data->blank_width = space_width (XWINDOW (data->window));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3707 while (Dynarr_length (db->runes) < pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3708 add_blank_rune (data, NULL, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3709
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3710 end = Dynarr_length (db->runes) + 1;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3711 if (max_pos != -1)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3712 end = min (max_pos, end);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3713
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3714 gb.glyph = glyph;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3715 gb.extent = Qnil;
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3716 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3717 pos++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3718
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3719 while (Dynarr_length (db->runes) < pos &&
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3720 (data->pixpos + data->blank_width <= data->max_pixpos))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3721 add_blank_rune (data, NULL, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3722
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3723 return Dynarr_length (db->runes);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3724 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3725
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3726 /* If max_pos is == -1, it is considered to be infinite. The same is
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3727 true of max_pixsize. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3728 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3729 if (Dynarr_length (data->db->runes)) \
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3730 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3731 else \
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3732 cur_pixsize = 0;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3733
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3734 /* Note that this function does "positions" in terms of characters and
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3735 not in terms of columns. This is necessary to make the formatting
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3736 work correctly when proportional width fonts are used in the
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3737 modeline. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3738 static Charcount
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3739 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3740 Charcount min_pos, Charcount max_pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3741 Lisp_Object elt, int depth, int max_pixsize,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3742 face_index findex, int type)
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3743 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3744 /* This function has been Mule-ized. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3745 /* #### The other losing things in this function are:
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3746
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3747 -- C zero-terminated-string lossage.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3748 -- Non-printable characters should be converted into something
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3749 appropriate (e.g. ^F) instead of blindly being printed anyway.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3750 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3751
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3752 tail_recurse:
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3753 if (depth > 10)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3754 goto invalid;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3755
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3756 depth++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3757
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3758 if (STRINGP (elt))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3759 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3760 /* A string. Add to the display line and check for %-constructs
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3761 within it. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3762
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3763 Bufbyte *this = XSTRING_DATA (elt);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3764
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3765 while ((pos < max_pos || max_pos == -1) && *this)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3766 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3767 Bufbyte *last = this;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3768
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3769 while (*this && *this != '%')
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3770 this++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3771
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3772 if (this != last)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3773 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3774 /* The string is just a string. */
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3775 Charcount size =
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3776 bytecount_to_charcount (last, this - last) + pos;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3777 Charcount tmp_max = (max_pos == -1 ? size : min (size, max_pos));
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3778
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3779 pos = add_string_to_fstring_db_runes (data, last, pos, pos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3780 tmp_max);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3781 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3782 else /* *this == '%' */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3783 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3784 Charcount spec_width = 0;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3785
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3786 this++; /* skip over '%' */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3787
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3788 /* We can't allow -ve args due to the "%-" construct.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3789 * Argument specifies minwidth but not maxwidth
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3790 * (maxwidth can be specified by
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3791 * (<negative-number> . <stuff>) modeline elements)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3792 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3793 while (isdigit (*this))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3794 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3795 spec_width = spec_width * 10 + (*this - '0');
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3796 this++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3797 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3798 spec_width += pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3799
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3800 if (*this == 'M')
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3801 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3802 pos = generate_fstring_runes (w, data, pos, spec_width,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3803 max_pos, Vglobal_mode_string,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3804 depth, max_pixsize, findex,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3805 type);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3806 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3807 else if (*this == '-')
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3808 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3809 Charcount num_to_add;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3810
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3811 if (max_pixsize < 0)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3812 num_to_add = 0;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3813 else if (max_pos != -1)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3814 num_to_add = max_pos - pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3815 else
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3816 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3817 int cur_pixsize;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3818 int dash_pixsize;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3819 Bufbyte ch = '-';
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3820 SET_CURRENT_MODE_CHARS_PIXSIZE;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3821
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3822 dash_pixsize =
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3823 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3824 1);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3825
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3826 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3827 num_to_add++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3828 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3829
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3830 while (num_to_add--)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3831 pos = add_string_to_fstring_db_runes
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3832 (data, (CONST Bufbyte *) "-", pos, pos, max_pos);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3833 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3834 else if (*this != 0)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3835 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3836 Bufbyte *str;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
3837 Emchar ch = charptr_emchar (this);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3838 decode_mode_spec (w, ch, type);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3839
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3840 str = Dynarr_atp (mode_spec_bufbyte_string, 0);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3841 pos = add_string_to_fstring_db_runes (data,str, pos, pos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3842 max_pos);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3843 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3844
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3845 /* NOT this++. There could be any sort of character at
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3846 the current position. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3847 INC_CHARPTR (this);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3848 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3849
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3850 if (max_pixsize > 0)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3851 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3852 int cur_pixsize;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3853 SET_CURRENT_MODE_CHARS_PIXSIZE;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3854
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3855 if (cur_pixsize >= max_pixsize)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3856 break;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3857 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3858 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3859 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3860 else if (SYMBOLP (elt))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3861 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3862 /* A symbol: process the value of the symbol recursively
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3863 as if it appeared here directly. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3864 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3865
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3866 if (!UNBOUNDP (tem))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3867 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3868 /* If value is a string, output that string literally:
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3869 don't check for % within it. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3870 if (STRINGP (tem))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3871 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3872 pos =
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3873 add_string_to_fstring_db_runes
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3874 (data, XSTRING_DATA (tem), pos, min_pos, max_pos);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3875 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3876 /* Give up right away for nil or t. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3877 else if (!EQ (tem, elt))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3878 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3879 elt = tem;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3880 goto tail_recurse;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3881 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3882 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3883 }
274
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3884 else if (GENERIC_SPECIFIERP (elt))
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3885 {
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3886 Lisp_Object window, tem;
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3887 XSETWINDOW (window, w);
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3888 tem = specifier_instance_no_quit (elt, Qunbound, window,
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3889 ERROR_ME_NOT, 0, Qzero);
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3890 if (!UNBOUNDP (tem))
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3891 {
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3892 elt = tem;
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3893 goto tail_recurse;
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3894 }
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3895 }
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3896 else if (CONSP (elt))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3897 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3898 /* A cons cell: four distinct cases.
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3899 * If first element is a string or a cons, process all the elements
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3900 * and effectively concatenate them.
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3901 * If first element is a negative number, truncate displaying cdr to
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3902 * at most that many characters. If positive, pad (with spaces)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3903 * to at least that many characters.
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3904 * If first element is a symbol, process the cadr or caddr recursively
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3905 * according to whether the symbol's value is non-nil or nil.
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3906 * If first element is a face, process the cdr recursively
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3907 * without altering the depth.
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3908 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3909 Lisp_Object car, tem;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3910
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3911 car = XCAR (elt);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3912 if (SYMBOLP (car))
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3913 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3914 elt = XCDR (elt);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3915 if (!CONSP (elt))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3916 goto invalid;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3917 tem = symbol_value_in_buffer (car, w->buffer);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3918 /* elt is now the cdr, and we know it is a cons cell.
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3919 Use its car if CAR has a non-nil value. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3920 if (!UNBOUNDP (tem))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3921 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3922 if (!NILP (tem))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3923 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3924 elt = XCAR (elt);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3925 goto tail_recurse;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3926 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3927 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3928 /* Symbol's value is nil (or symbol is unbound)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3929 * Get the cddr of the original list
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3930 * and if possible find the caddr and use that.
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3931 */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3932 elt = XCDR (elt);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3933 if (NILP (elt))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3934 ;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3935 else if (!CONSP (elt))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3936 goto invalid;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3937 else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3938 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3939 elt = XCAR (elt);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3940 goto tail_recurse;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3941 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3942 }
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3943 else if (INTP (car))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3944 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3945 Charcount lim = XINT (car);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3946
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3947 elt = XCDR (elt);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3948
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3949 if (lim < 0)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3950 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3951 /* Negative int means reduce maximum width.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3952 * DO NOT change MIN_PIXPOS here!
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3953 * (20 -10 . foo) should truncate foo to 10 col
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3954 * and then pad to 20.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3955 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3956 if (max_pos == -1)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3957 max_pos = pos - lim;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3958 else
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3959 max_pos = min (max_pos, pos - lim);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3960 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3961 else if (lim > 0)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3962 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3963 /* Padding specified. Don't let it be more than
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3964 * current maximum.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3965 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3966 lim += pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3967 if (max_pos != -1 && lim > max_pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3968 lim = max_pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3969 /* If that's more padding than already wanted, queue it.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3970 * But don't reduce padding already specified even if
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3971 * that is beyond the current truncation point.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3972 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3973 if (lim > min_pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3974 min_pos = lim;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3975 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3976 goto tail_recurse;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3977 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3978 else if (STRINGP (car) || CONSP (car))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3979 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3980 int limit = 50;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3981 /* LIMIT is to protect against circular lists. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3982 while (CONSP (elt) && --limit > 0
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3983 && (pos < max_pos || max_pos == -1))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3984 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3985 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3986 XCAR (elt), depth,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
3987 max_pixsize, findex, type);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3988 elt = XCDR (elt);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3989 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3990 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3991 else if (EXTENTP (car))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3992 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3993 struct extent *ext = XEXTENT (car);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3994
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3995 if (EXTENT_LIVE_P (ext))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3996 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3997 face_index old_findex = data->findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3998 Lisp_Object face;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3999 Lisp_Object font_inst;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4000 face_index new_findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4001 Bytecount start = data->bytepos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4002
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4003 face = extent_face (ext);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4004 if (FACEP (face))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4005 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4006 /* #### needs to merge faces, sigh */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4007 /* #### needs to handle list of faces */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4008 new_findex = get_builtin_face_cache_index (w, face);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4009 /* !!#### not right; needs to compute the max height of
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4010 all the charsets */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4011 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4012 Vcharset_ascii);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4013
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4014 data->dl->ascent = max (data->dl->ascent,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4015 XFONT_INSTANCE (font_inst)->ascent);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4016 data->dl->descent = max (data->dl->descent,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4017 XFONT_INSTANCE (font_inst)->
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4018 descent);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4019 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4020 else
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4021 new_findex = old_findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4022
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4023 data->findex = new_findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4024 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4025 XCDR (elt), depth - 1,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4026 max_pixsize, new_findex, type);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4027 data->findex = old_findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4028 Dynarr_add (formatted_string_extent_dynarr, ext);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4029 Dynarr_add (formatted_string_extent_start_dynarr, start);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4030 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4031 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4032 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4033 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4034 else if (GLYPHP (elt))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4035 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4036 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4037 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4038 else
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4039 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4040 invalid:
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4041 pos =
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4042 add_string_to_fstring_db_runes
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4043 (data, (CONST Bufbyte *) GETTEXT ("*invalid*"), pos, min_pos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4044 max_pos);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4045 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4046
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4047 if (min_pos > pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4048 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4049 add_string_to_fstring_db_runes (data, (CONST Bufbyte *) "", pos, min_pos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4050 -1);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4051 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4052
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4053 return pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4054 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4055
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4056 /* The caller is responsible for freeing the returned string. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4057 Bufbyte *
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4058 generate_formatted_string (struct window *w, Lisp_Object format_str,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4059 Lisp_Object result_str, face_index findex, int type)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4060 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4061 struct display_line *dl;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4062 struct display_block *db;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4063 int elt = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4064
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4065 dl = &formatted_string_display_line;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4066 db = get_display_block_from_line (dl, TEXT);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4067 Dynarr_reset (db->runes);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4068
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4069 generate_formatted_string_db (format_str, result_str, w, dl, db, findex, 0,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4070 -1, type);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4071
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4072 Dynarr_reset (formatted_string_emchar_dynarr);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4073 while (elt < Dynarr_length (db->runes))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4074 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4075 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4076 Dynarr_add (formatted_string_emchar_dynarr,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4077 Dynarr_atp (db->runes, elt)->object.chr.ch);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4078 elt++;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4079 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4080
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4081 return
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4082 convert_emchar_string_into_malloced_string
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4083 ( Dynarr_atp (formatted_string_emchar_dynarr, 0),
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4084 Dynarr_length (formatted_string_emchar_dynarr), 0);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4085 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4086
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4087 /* Update just the modeline. Assumes the desired display structs. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4088 they do not have a modeline block, it does nothing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4089 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4090 regenerate_modeline (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4091 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4092 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4093
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4094 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4095 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4096 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4097 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4098 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4099 redisplay_update_line (w, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4100 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4101 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4103 /* Make sure that modeline display line is present in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4104 display structs if the window has a modeline and update that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4105 line. Returns true if a modeline was needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4106 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4107 ensure_modeline_generated (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4108 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4109 int need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4111 /* minibuffer windows don't have modelines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4112 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4113 need_modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4114 /* windows which haven't had it turned off do */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4115 else if (WINDOW_HAS_MODELINE_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4116 need_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4117 /* windows which have it turned off don't have a divider if there is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4118 a horizontal scrollbar */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4119 else if (window_scrollbar_height (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4120 need_modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4121 /* and in this case there is none */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4122 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4123 need_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4125 if (need_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4126 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4127 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4129 dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4131 /* We don't care if there is a display line which is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4132 currently a modeline because it is definitely going to become
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4133 one if we have gotten to this point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4134 if (Dynarr_length (dla) == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4135 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4136 if (Dynarr_largest (dla) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4137 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4138 struct display_line *mlp = Dynarr_atp (dla, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4139 Dynarr_add (dla, *mlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4140 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4141 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4142 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4143 struct display_line modeline;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
4144 xzero (modeline);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4145 Dynarr_add (dla, modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4146 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4147 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4148
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4149 /* If we're adding a new place marker go ahead and generate the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4150 modeline so that it is available for use by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4151 window_modeline_height. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4152 generate_modeline (w, Dynarr_atp (dla, 0), type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4153 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4155 return need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4156 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4157
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4158 /* #### Kludge or not a kludge. I tend towards the former. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4159 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4160 real_current_modeline_height (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4161 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4162 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4163 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4164
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4165 if (ensure_modeline_generated (w, CMOTION_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4166 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4167 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4168
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4169 if (Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4170 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4171 if (Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4172 return (Dynarr_atp (dla, 0)->ascent +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4173 Dynarr_atp (dla, 0)->descent);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4174 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4175 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4176 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4177 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4180 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4181 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4182 /* window-regeneration routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4183 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4184 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4186 /* For a given window and starting position in the buffer it contains,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4187 ensure that the TYPE display lines accurately represent the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4188 presentation of the window. We pass the buffer instead of getting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4189 it from the window since redisplay_window may have temporarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4190 changed it to the echo area buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4191
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4192 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4193 regenerate_window (struct window *w, Bufpos start_pos, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4194 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4195 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4196 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4197 int ypos = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4198 int yend; /* set farther down */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4200 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4201 layout_bounds bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4202 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4203 int need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4204
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4205 /* The lines had better exist by this point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4206 if (!(dla = window_display_lines (w, type)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4207 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4208 Dynarr_reset (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4209 w->max_line_len = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4210
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4211 /* Normally these get updated in redisplay_window but it is possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4212 for this function to get called from some other points where that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4213 update may not have occurred. This acts as a safety check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4214 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4215 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4216 if (!Dynarr_length (w->glyph_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4217 reset_glyph_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4219 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4220 Fset_marker (w->pointm[type], make_int (point), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4221 w->last_point_x[type] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4222 w->last_point_y[type] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4223
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4224 /* Make sure a modeline is in the structs if needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4225 need_modeline = ensure_modeline_generated (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4226
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4227 /* Wait until here to set this so that the structs have a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4228 generated in the case where one didn't exist. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4229 yend = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4230
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4231 bounds = calculate_display_line_boundaries (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4232
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4233 /* 97/3/14 jhod: stuff added here to support pre-prompts (used for input systems) */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4234 if (MINI_WINDOW_P (w)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4235 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4236 && !echo_area_active (f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4237 && start_pos == BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4238 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4239 struct prop_block pb;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4240 Lisp_Object string;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4241 prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4242
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4243 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4244 pb.type = PROP_MINIBUF_PROMPT;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4245 pb.data.p_string.str = XSTRING_DATA(string);
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4246 pb.data.p_string.len = XSTRING_LENGTH(string);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4247 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4248 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4249 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4250 prop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4251
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4252 while (ypos < yend)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4253 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4254 struct display_line dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4255 struct display_line *dlp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4256 int local;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4257
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4258 if (Dynarr_length (dla) < Dynarr_largest (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4259 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4260 dlp = Dynarr_atp (dla, Dynarr_length (dla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4261 local = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4262 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4263 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4264 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
4265 xzero (dl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4266 dlp = &dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4267 local = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4268 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4270 dlp->bounds = bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4271 dlp->offset = 0;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4272 start_pos = generate_display_line (w, dlp, 1, start_pos,
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4273 w->hscroll, &prop, type);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4274 dlp->ypos = ypos + dlp->ascent;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4275 ypos = dlp->ypos + dlp->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4276
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4277 if (ypos > yend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4278 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4279 int visible_height = dlp->ascent + dlp->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4280
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4281 dlp->clip = (ypos - yend);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4282 visible_height -= dlp->clip;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4283
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4284 if (visible_height < VERTICAL_CLIP (w, 1))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4285 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4286 if (local)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4287 free_display_line (dlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4288 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4289 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4290 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4291 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4292 dlp->clip = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4294 if (dlp->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4295 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4296 /* #### This check is steaming crap. Have to get things
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4297 fixed so when create_text_block hits EOB, we're done,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4298 period. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4299 if (w->last_point_x[type] == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4300 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4301 w->last_point_x[type] = dlp->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4302 w->last_point_y[type] = Dynarr_length (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4303 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4304 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4305 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4306 /* #### This means that we've added a cursor at EOB
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4307 twice. Yuck oh yuck. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4308 struct display_block *db =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4309 get_display_block_from_line (dlp, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4310
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4311 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4312 dlp->cursor_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4313 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4314 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4315
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4316 if (dlp->num_chars > w->max_line_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4317 w->max_line_len = dlp->num_chars;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4319 Dynarr_add (dla, *dlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4321 /* #### This isn't right, but it is close enough for now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4322 w->window_end_pos[type] = start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4323
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4324 /* #### This type of check needs to be done down in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4325 generate_display_line call. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4326 if (start_pos > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4327 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4328 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4330 if (prop)
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
4331 Dynarr_free (prop);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4333 /* #### More not quite right, but close enough. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4334 /* #### Ben sez: apparently window_end_pos[] is measured
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4335 as the number of characters between the window end and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4336 end of the buffer? This seems rather weirdo. What's
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4337 the justification for this? */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4338 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4339
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4340 if (need_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4341 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4342 /* We know that this is the right thing to use because we put it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4343 there when we first started working in this function. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4344 generate_modeline (w, Dynarr_atp (dla, 0), type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4345 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4346 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4347
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4348 #define REGEN_INC_FIND_START_END \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4349 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4350 /* Determine start and end of lines. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4351 if (!Dynarr_length (cdla)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4352 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4353 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4354 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4355 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4356 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4357 dla_start = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4358 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4359 else if (!Dynarr_atp (cdla, 0)->modeline \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4360 && !Dynarr_atp (ddla, 0)->modeline) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4361 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4362 dla_start = 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4363 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4364 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4365 abort (); /* structs differ */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4366 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4367 dla_end = Dynarr_length (cdla) - 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4368 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4369 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4370 start_pos = (Dynarr_atp (cdla, dla_start)->bufpos \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4371 + Dynarr_atp (cdla, dla_start)->offset); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4372 /* If this isn't true, then startp has changed and we need to do a \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4373 full regen. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4374 if (startp != start_pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4375 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4376 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4377 /* Point is outside the visible region so give up. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4378 if (pointm < start_pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4379 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4380 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4381 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4382
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4383 /* This attempts to incrementally update the display structures. It
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4384 returns a boolean indicating success or failure. This function is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4385 very similar to regenerate_window_incrementally and is in fact only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4386 called from that function. However, because of the nature of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4387 changes it deals with it sometimes makes different assumptions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4388 which can lead to success which are much more difficult to make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4389 when dealing with buffer changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4390
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4391 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4392 regenerate_window_extents_only_changed (struct window *w, Bufpos startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4393 Bufpos pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4394 Charcount beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4395 Charcount end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4396 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4397 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4398 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4399 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4401 int dla_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4402 int dla_end, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4403 int first_line, last_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4404 Bufpos start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4405 /* Don't define this in the loop where it is used because we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4406 definitely want its value to survive between passes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4407 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4409 /* If we don't have any buffer change recorded but the modiff flag has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4410 been incremented, then fail. I'm not sure of the exact circumstances
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4411 under which this can happen, but I believe that it is probably a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4412 reasonable happening. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4413 if (!point_visible (w, pointm, CURRENT_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4414 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4415 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4416
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4417 /* If the cursor is moved we attempt to update it. If we succeed we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4418 go ahead and proceed with the optimization attempt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4419 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4420 || pointm != marker_position (w->last_point[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4421 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4422 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4423 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4424 struct frame *sel_f = device_selected_frame (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4425 int success = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4427 if (w->last_point_x[CURRENT_DISP] != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4428 && w->last_point_y[CURRENT_DISP] != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4429 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4430
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4431 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4432 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4433 /* Always regenerate the modeline in case it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4434 displaying the current line or column. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4435 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4436 success = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4437 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4438 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4439 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4440 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4441 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4442 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4443 success = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4444 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4445
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4446 if (!success)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4447 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4448 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4450 if (beg_unchanged == -1 && end_unchanged == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4451 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4453 /* assert: There are no buffer modifications or they are all below the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4454 visible region. We assume that regenerate_window_incrementally has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4455 not called us unless this is true. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4456
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4457 REGEN_INC_FIND_START_END;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4458
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4459 /* If the changed are starts before the visible area, give up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4460 if (beg_unchanged < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4461 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4463 /* Find what display line the extent changes first affect. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4464 line = dla_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4465 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4466 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4467 struct display_line *dl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4468 Bufpos lstart = dl->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4469 Bufpos lend = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4471 if (beg_unchanged >= lstart && beg_unchanged <= lend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4472 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4474 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4475 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4477 /* If the changes are below the visible area then if point hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4478 moved return success otherwise fail in order to be safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4479 if (line > dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4480 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4481 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4482 && pointm == marker_position (w->last_point[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4483 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4484 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4485 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4486 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4488 /* At this point we know what line the changes first affect. We now
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4489 begin redrawing lines as long as we are still in the affected
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4490 region and the line's size and positioning don't change.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4491 Otherwise we fail. If we fail we will have altered the desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4492 structs which could lead to an assertion failure. However, if we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4493 fail the next thing that is going to happen is a full regen so we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4494 will actually end up being safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4495 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4496 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4497 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4498 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4499
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4500 first_line = last_line = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4501 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4502 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4503 Bufpos old_start, old_end, new_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4504 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4505 struct display_line *ddl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4506 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4507 int initial_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4508
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4509 assert (cdl->bufpos == ddl->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4510 assert (cdl->end_bufpos == ddl->end_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4511 assert (cdl->offset == ddl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4512
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4513 db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4514 initial_size = Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4515 old_start = ddl->bufpos + ddl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4516 old_end = ddl->end_bufpos + ddl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4517
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4518 /* If this is the first line being updated and it used
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4519 propagation data, fail. Otherwise we'll be okay because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4520 we'll have the necessary propagation data. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4521 if (line == first_line && ddl->used_prop_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4522 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4524 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4525 w->hscroll, &prop, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4526 ddl->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4527
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4528 /* #### If there is propagated stuff the fail. We could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4529 probably actually deal with this if the line had propagated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4530 information when originally created by a full
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4531 regeneration. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4532 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4533 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4534 Dynarr_free (prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4535 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4536 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4538 /* If any line position parameters have changed or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4539 cursor has disappeared or disappeared, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4540 db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4541 if (cdl->ypos != ddl->ypos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4542 || cdl->ascent != ddl->ascent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4543 || cdl->descent != ddl->descent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4544 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4545 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4546 || old_start != ddl->bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4547 || old_end != ddl->end_bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4548 || initial_size != Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4549 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4550 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4551 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4552
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4553 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4554 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4555 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4556 w->last_point_y[DESIRED_DISP] = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4557 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4559 last_line = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4560
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4561 /* If the extent changes end on the line we just updated then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4562 we're done. Otherwise go on to the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4563 if (end_unchanged <= ddl->end_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4564 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4565 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4566 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4567 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4568
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4569 redisplay_update_line (w, first_line, last_line, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4570 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4571 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4573 /* Attempt to update the display data structures based on knowledge of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4574 the changed region in the buffer. Returns a boolean indicating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4575 success or failure. If this function returns a failure then a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4576 regenerate_window _must_ be performed next in order to maintain
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4577 invariants located here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4578
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4579 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4580 regenerate_window_incrementally (struct window *w, Bufpos startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4581 Bufpos pointm)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4582 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4583 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4584 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4585 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4586 Charcount beg_unchanged, end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4587 Charcount extent_beg_unchanged, extent_end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4589 int dla_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4590 int dla_end, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4591 Bufpos start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4592
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4593 /* If this function is called, the current and desired structures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4594 had better be identical. If they are not, then that is a bug. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4595 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4596
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4597 /* We don't handle minibuffer windows yet. The minibuffer prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4598 screws us up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4599 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4600 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4601
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4602 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4603 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4604 ? -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4605 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4607 /* If nothing has changed in the buffer, then make sure point is ok
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4608 and succeed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4609 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4610 return regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4611 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4612 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4613
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4614 /* We can't deal with deleted newlines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4615 if (BUF_NEWLINE_WAS_DELETED (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4616 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4618 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4619 end_unchanged = (BUF_END_UNCHANGED (b) == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4620 ? -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4621 : BUF_Z (b) - BUF_END_UNCHANGED (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4623 REGEN_INC_FIND_START_END;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4624
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4625 /* If the changed area starts before the visible area, give up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4626 if (beg_unchanged < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4627 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4629 /* Find what display line the buffer changes first affect. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4630 line = dla_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4631 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4632 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4633 struct display_line *dl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4634 Bufpos lstart = dl->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4635 Bufpos lend = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4636
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4637 if (beg_unchanged >= lstart && beg_unchanged <= lend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4638 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4639
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4640 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4641 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4642
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4643 /* If the changes are below the visible area then if point hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4644 moved return success otherwise fail in order to be safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4645 if (line > dla_end)
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
4646 return regenerate_window_extents_only_changed (w, startp, pointm,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
4647 extent_beg_unchanged,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
4648 extent_end_unchanged);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4649 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4650 /* At this point we know what line the changes first affect. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4651 now redraw that line. If the changes are contained within it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4652 we are going to succeed and can update just that one line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4653 Otherwise we fail. If we fail we will have altered the desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4654 structs which could lead to an assertion failure. However, if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4655 we fail the next thing that is going to happen is a full regen
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4656 so we will actually end up being safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4657 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4658 Bufpos new_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4659 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4660 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4661 struct display_line *ddl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4662
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4663 assert (cdl->bufpos == ddl->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4664 assert (cdl->end_bufpos == ddl->end_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4665 assert (cdl->offset == ddl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4666
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4667 /* If the last rune is already a continuation glyph, fail.
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4668 #### We should be able to handle this better. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4669 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4670 struct display_block *db = get_display_block_from_line (ddl, TEXT);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4671 if (Dynarr_length (db->runes))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4672 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4673 struct rune *rb =
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4674 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4675
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4676 if (rb->type == RUNE_DGLYPH
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4677 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4678 return 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4679 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4680 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4681
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4682 /* If the line was generated using propagation data, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4683 if (ddl->used_prop_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4684 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4685
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4686 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4687 w->hscroll, &prop, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4688 ddl->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4689
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4690 /* If there is propagated stuff then it is pretty much a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4691 guarantee that more than just the one line is affected. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4692 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4693 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4694 Dynarr_free (prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4695 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4696 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4697
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4698 /* If the last rune is now a continuation glyph, fail. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4699 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4700 struct display_block *db = get_display_block_from_line (ddl, TEXT);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4701 if (Dynarr_length (db->runes))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4702 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4703 struct rune *rb =
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4704 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4705
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4706 if (rb->type == RUNE_DGLYPH
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4707 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4708 return 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4709 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
4710 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4711
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4712 /* If any line position parameters have changed or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4713 cursor has disappeared or disappeared, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4714 if (cdl->ypos != ddl->ypos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4715 || cdl->ascent != ddl->ascent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4716 || cdl->descent != ddl->descent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4717 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4718 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4719 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4720 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4721 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4722
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4723 /* If the changed area also ends on this line, then we may be in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4724 business. Update everything and return success. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4725 if (end_unchanged >= ddl->bufpos && end_unchanged <= ddl->end_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4726 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4727 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4728 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4729 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4730 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4731 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4732 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4733
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4734 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4735 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4736 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4737 w->last_point_y[DESIRED_DISP] = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4738 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4739
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4740 redisplay_update_line (w, line, line, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4741 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4742
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4743 /* #### For now we just flush the cache until this has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4744 tested. After that is done, this should correct the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4745 cache directly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4746 Dynarr_reset (w->line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4748 /* Adjust the extent changed boundaries to remove any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4749 overlap with the buffer changes since we've just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4750 successfully updated that area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4751 if (extent_beg_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4752 && extent_beg_unchanged >= beg_unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4753 && extent_beg_unchanged < end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4754 extent_beg_unchanged = end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4755
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4756 if (extent_end_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4757 && extent_end_unchanged >= beg_unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4758 && extent_end_unchanged < end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4759 extent_end_unchanged = beg_unchanged - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4760
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4761 if (extent_end_unchanged <= extent_beg_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4762 extent_beg_unchanged = extent_end_unchanged = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4764 /* This could lead to odd results if it fails, but since the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4765 buffer changes update succeeded this probably will to.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4766 We already know that the extent changes start at or after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4767 the line because we checked before entering the loop. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4768 if (extent_beg_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4769 && extent_end_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4770 && ((extent_beg_unchanged < ddl->bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4771 || (extent_end_unchanged > ddl->end_bufpos)))
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
4772 return regenerate_window_extents_only_changed (w, startp, pointm,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
4773 extent_beg_unchanged,
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
4774 extent_end_unchanged);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4775 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4776 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4777 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4778 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4779
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4780 /* Oh, well. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4781 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4782 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4783
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4784 /* Given a window and a point, update the given display lines such
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
4785 that point is displayed in the middle of the window.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4786 Return the window's new start position. */
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4787
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4788 static Bufpos
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4789 regenerate_window_point_center (struct window *w, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4790 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4791 Bufpos startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4792
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4793 /* We need to make sure that the modeline is generated so that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4794 window height can be calculated correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4795 ensure_modeline_generated (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4797 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4798 regenerate_window (w, startp, point, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4799 Fset_marker (w->start[type], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4800
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4801 return startp;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4802 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4803
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4804 /* Given a window and a set of display lines, return a boolean
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4805 indicating whether the given point is contained within. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4806
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4807 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4808 point_visible (struct window *w, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4809 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4810 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4811 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4812 int first_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4814 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4815 first_line = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4816 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4817 first_line = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4818
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4819 if (Dynarr_length (dla) > first_line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4820 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4821 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4822 struct display_line *dl = Dynarr_atp (dla, first_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4824 start = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4825 end = BUF_Z (b) - w->window_end_pos[type] - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4826
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4827 if (point >= start && point <= end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4828 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4829 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4830 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4831 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4832
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4833 if (point >= (dl->bufpos + dl->offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4834 && point <= (dl->end_bufpos + dl->offset))
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
4835 return !dl->clip;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4836 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4837 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4838 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4839 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4840 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4841 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4842 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4843 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4844 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4845 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4846 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4847 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4849 /* Return pixel position the middle of the window, not including the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4850 modeline and any potential horizontal scrollbar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4851
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4852 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4853 window_half_pixpos (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4854 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
4855 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4856 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4858 /* Return the display line which is currently in the middle of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4859 window W for display lines TYPE. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4860
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4861 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4862 line_at_center (struct window *w, int type, Bufpos start, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4863 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4864 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4865 int half;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4866 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4867 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4868
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4869 if (type == CMOTION_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4870 regenerate_window (w, start, point, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4871
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4872 dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4873 half = window_half_pixpos (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4874
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4875 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4876 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4877 struct display_line *dl = Dynarr_atp (dla, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4878 int line_bot = dl->ypos + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4879
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4880 if (line_bot > half)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4881 return elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4882 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4883
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4884 /* We may not have a line at the middle if the end of the buffer is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4885 being displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4886 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4887 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4888
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4889 /* Return a value for point that would place it at the beginning of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4890 the line which is in the middle of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4891
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4892 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4893 point_at_center (struct window *w, int type, Bufpos start, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4894 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4895 /* line_at_center will regenerate the display structures, if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4896 int line = line_at_center (w, type, start, point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4898 if (line == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4899 return BUF_ZV (XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4900 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4901 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4902 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4903 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4904
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4905 return dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4906 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4907 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4908
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4909 /* For a given window, ensure that the current visual representation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4910 is accurate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4911
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4912 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4913 redisplay_window (Lisp_Object window, int skip_selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4914 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4915 struct window *w = XWINDOW (window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4916 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4917 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4918 Lisp_Object old_buffer = w->buffer;
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4919 Lisp_Object the_buffer = w->buffer;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4920 struct buffer *b;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4921 int echo_active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4922 int startp = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4923 int pointm;
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4924 int old_startp = 1;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4925 int old_pointm = 1;
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4926 int selected_in_its_frame;
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4927 int selected_globally;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4928 int skip_output = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4929 int truncation_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4930 int inactive_minibuffer =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4931 (MINI_WINDOW_P (w) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4932 (f != device_selected_frame (d)) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4933 !is_surrogate_for_selected_frame (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4934
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4935 /* #### In the new world this function actually does a bunch of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4936 optimizations such as buffer-based scrolling, but none of that is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4937 implemented yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4938
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4939 /* If this is a combination window, do its children; that's all.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4940 The selected window is always a leaf so we don't check for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4941 skip_selected here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4942 if (!NILP (w->vchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4943 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4944 redisplay_windows (w->vchild, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4945 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4946 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4947 if (!NILP (w->hchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4948 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4949 redisplay_windows (w->hchild, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4950 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4951 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4953 /* Is this window the selected window on its frame? */
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4954 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4955 selected_globally =
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4956 selected_in_its_frame &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4957 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4958 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4959 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4960 if (skip_selected && selected_in_its_frame)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4961 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4962
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4963 /* It is possible that the window is not fully initialized yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4964 if (NILP (w->buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4965 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4966
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4967 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4968 {
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4969 w->buffer = the_buffer = Vecho_area_buffer;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4970 echo_active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4971 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4972
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4973 b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4975 if (echo_active)
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4976 {
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4977 old_pointm = selected_globally
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4978 ? BUF_PT (b)
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4979 : marker_position (w->pointm[CURRENT_DISP]);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4980 pointm = 1;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4981 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4982 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4983 {
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4984 if (selected_globally)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4985 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4986 pointm = BUF_PT (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4987 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4988 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4989 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4990 pointm = marker_position (w->pointm[CURRENT_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4992 if (pointm < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4993 pointm = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4994 else if (pointm > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4995 pointm = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4996 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4997 }
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4998 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4999
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5000 /* If the buffer has changed we have to invalid all of our face
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5001 cache elements. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5002 if ((!echo_active && b != window_display_buffer (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5003 || !Dynarr_length (w->face_cachels)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5004 || f->faces_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5005 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5006 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5007 mark_face_cachels_as_not_updated (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5008
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5009 /* Ditto the glyph cache elements. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5010 if ((!echo_active && b != window_display_buffer (w))
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5011 || !Dynarr_length (w->glyph_cachels)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5012 || f->glyphs_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5013 reset_glyph_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5014 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5015 mark_glyph_cachels_as_not_updated (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5016
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5017 /* If the marker's buffer is not the window's buffer, then we need
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5018 to find a new starting position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5019 if (!MINI_WINDOW_P (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5020 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5021 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5022 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5023
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5024 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5025 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5026
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5027 if (echo_active)
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5028 {
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5029 old_startp = marker_position (w->start[CURRENT_DISP]);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5030 startp = 1;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5031 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5032 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5033 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5034 startp = marker_position (w->start[CURRENT_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5035 if (startp < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5036 startp = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5037 else if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5038 startp = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5039 }
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5040 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5042 truncation_changed = (find_window_mirror (w)->truncate_win !=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5043 window_truncation_on (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5044
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5045 /* If w->force_start is set, then some function set w->start and we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5046 should display from there and change point, if necessary, to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5047 ensure that it is visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5048 if (w->force_start || inactive_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5049 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5050 w->force_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5051 w->last_modified[DESIRED_DISP] = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5052 w->last_facechange[DESIRED_DISP] = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5053
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5054 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5055
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5056 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5057 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5058 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5059
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5060 if (selected_globally)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5061 BUF_SET_PT (b, pointm);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5062
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5063 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5064 the_buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5065
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
5066 /* #### BUFU amounts of overkill just to get the cursor
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5067 location marked properly. FIX ME FIX ME FIX ME */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5068 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5069 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5070
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5071 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5072 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5073
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5074 /* If nothing has changed since the last redisplay, then we just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5075 need to make sure that point is still visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5076 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5077 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5078 && pointm >= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5079 /* This check is to make sure we restore the minibuffer after a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5080 temporary change to the echo area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5081 && !(MINI_WINDOW_P (w) && f->buffers_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5082 && !f->frame_changed
373
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
5083 && !truncation_changed
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
5084 /* check whether start is really at the begining of a line GE */
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
5085 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
6240c7796c7a Import from CVS: tag r21-2b2
cvs
parents: 371
diff changeset
5086 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5087 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5088 /* Check if the cursor has actually moved. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5089 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5090 && pointm == marker_position (w->last_point[CURRENT_DISP])
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5091 && selected_globally
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5092 && !w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5093 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5094 && !f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5095 && !f->faces_changed
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5096 && !f->glyphs_changed
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
5097 && !f->subwindows_changed
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5098 && !f->point_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5099 && !f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5100 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5101 /* If not, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5102 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5103 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5105 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5106 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5107 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5108 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5109 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5110 /* If the new point is visible in the redisplay structures,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5111 then let the output update routines handle it, otherwise
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5112 do things the hard way. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5113 if (!w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5114 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5115 && !f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5116 && !f->faces_changed
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5117 && !f->glyphs_changed
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
5118 && !f->subwindows_changed
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5119 && !f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5120 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5121 if (point_visible (w, pointm, CURRENT_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5122 && w->last_point_x[CURRENT_DISP] != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5123 && w->last_point_y[CURRENT_DISP] != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5124 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5125 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5126 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5127 /* Always regenerate in case it is displaying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5128 the current line or column. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5129 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5131 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5132 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5133 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5134 }
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5135 else if (!selected_in_its_frame && !f->point_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5136 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5137 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5138 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5139
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5140 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5141 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5142 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5143 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5145 /* If we weren't able to take the shortcut method, then use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5146 the brute force method. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5147 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5148
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5149 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5150 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5151 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5152 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5154 /* Check if the starting point is no longer at the beginning of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5155 line, in which case find a new starting point. We also recenter
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5156 if our start position is equal to point-max. Otherwise we'll end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5157 up with a blank window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5158 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5159 && !(startp == BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5160 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5161 || (pointm == startp &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5162 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5163 startp < marker_position (w->last_start[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5164 || (startp == BUF_ZV (b)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5165 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5166 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5168 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5169 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5170 /* See if we can update the data structures locally based on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5171 knowledge of what changed in the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5172 else if (!w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5173 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5174 && !f->faces_changed
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5175 && !f->glyphs_changed
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
5176 && !f->subwindows_changed
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5177 && !f->windows_structure_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5178 && !f->frame_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5179 && !truncation_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5180 && pointm >= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5181 && regenerate_window_incrementally (w, startp, pointm))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5182 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5183 if (f->modeline_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5184 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5185 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5186 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5187
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5188 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5189 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5190 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5191 /* #### This is where a check for structure based scrolling would go. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5192 /* If all else fails, try just regenerating and see what happens. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5193 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5194 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5195 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5196
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5197 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5198 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5199 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5201 /* We still haven't gotten the window regenerated with point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5202 visible. Next we try scrolling a little and see if point comes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5203 back onto the screen. */
274
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
5204 if (scroll_step > 0)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5205 {
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5206 int scrolled = scroll_conservatively;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5207 for (; scrolled >= 0; scrolled -= scroll_step)
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5208 {
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5209 startp = vmotion (w, startp,
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5210 (pointm < startp) ? -scroll_step : scroll_step, 0);
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5211 regenerate_window (w, startp, pointm, DESIRED_DISP);
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5212
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5213 if (point_visible (w, pointm, DESIRED_DISP))
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5214 goto regeneration_done;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5215 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5216 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5218 /* We still haven't managed to get the screen drawn with point on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5219 the screen, so just center it and be done with it. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5220 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5222
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5223 regeneration_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5225 /* If the window's frame is changed then reset the current display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5226 lines in order to force a full repaint. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5227 if (f->frame_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5228 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5229 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5230
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5231 Dynarr_reset (cla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5232 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5234 /* Must do this before calling redisplay_output_window because it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5235 sets some markers on the window. */
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5236 if (echo_active)
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5237 {
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5238 w->buffer = old_buffer;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5239 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5240 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5241 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5242
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5243 /* These also have to be set before calling redisplay_output_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5244 since it sets the CURRENT_DISP values based on them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5245 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5246 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5247 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5248 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5249
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5250 if (!skip_output)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5251 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5252 Bufpos start = marker_position (w->start[DESIRED_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5253 Bufpos end = (w->window_end_pos[DESIRED_DISP] == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5254 ? BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5255 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
5256 /* Don't pollute the cache if not sure if we are correct */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
5257 if (w->start_at_line_beg)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
5258 update_line_start_cache (w, start, end, pointm, 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5259 redisplay_output_window (w);
249
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5260 /*
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5261 * If we just displayed the echo area, the line start cache is
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
5262 * no longer valid, because the minibuffer window is associated
249
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5263 * with the window now.
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5264 */
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5265 if (echo_active)
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5266 w->line_cache_last_updated = make_int (-1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5267 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5268
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5269 /* #### This should be dependent on face changes and will need to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5270 somewhere else once tty updates occur on a per-frame basis. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5271 mark_face_cachels_as_clean (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5272
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5273 w->windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5274 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5275
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5276 /* Call buffer_reset_changes for all buffers present in any window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5277 currently visible in all frames on all devices. #### There has to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5278 be a better way to do this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5280 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5281 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5282 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5283 buffer_reset_changes (XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5284 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5285 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5286
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5287 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5288 reset_buffer_changes (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5289 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5290 Lisp_Object frmcons, devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5291
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5292 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5293 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5294 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5295
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5296 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5297 map_windows (f, reset_buffer_changes_mapfun, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5298 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5299 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5300
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5301 /* Ensure that all windows underneath the given window in the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5302 hierarchy are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5303
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5304 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5305 redisplay_windows (Lisp_Object window, int skip_selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5306 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5307 for (; !NILP (window) ; window = XWINDOW (window)->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5308 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5309 redisplay_window (window, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5310 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5311 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5312
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5313 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5314 call_redisplay_end_triggers (struct window *w, void *closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5315 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5316 Bufpos lrpos = w->last_redisplay_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5317 w->last_redisplay_pos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5318 if (!NILP (w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5319 && !NILP (w->redisplay_end_trigger)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5320 && lrpos > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5321 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5322 Bufpos pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5323
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5324 if (MARKERP (w->redisplay_end_trigger)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5325 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5326 pos = marker_position (w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5327 else if (INTP (w->redisplay_end_trigger))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5328 pos = XINT (w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5329 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5330 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5331 w->redisplay_end_trigger = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5332 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5333 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5334
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5335 if (lrpos >= pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5336 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
5337 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5338 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5339 va_run_hook_with_args_in_buffer (XBUFFER (w->buffer),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5340 Qredisplay_end_trigger_functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5341 2, window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5342 w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5343 w->redisplay_end_trigger = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5344 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5345 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5346
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5347 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5348 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5350 /* Ensure that all windows on the given frame are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5351
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5352 static int
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5353 redisplay_frame (struct frame *f, int preemption_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5354 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5355 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5356
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5357 if (preemption_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5358 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5359 /* The preemption check itself takes a lot of time,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5360 so normally don't do it here. We do it if called
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5361 from Lisp, though (`redisplay-frame'). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5362 int preempted;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5363
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5364 REDISPLAY_PREEMPTION_CHECK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5365 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5366 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5367 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5369 /* Before we put a hold on frame size changes, attempt to process
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5370 any which are already pending. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5371 if (f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5372 change_frame_size (f, f->new_height, f->new_width, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5373
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5374 /* If frame size might need to be changed, due to changed size
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
5375 of toolbars, scrollbars etc, change it now */
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5376 if (f->size_slipped)
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5377 {
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5378 adjust_frame_size (f);
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5379 assert (!f->size_slipped);
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5380 }
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
5381
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5382 /* The menubar, toolbar, and icon updates must be done before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5383 hold_frame_size_changes is called and we are officially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5384 'in_display'. They may eval lisp code which may call Fsignal.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5385 If in_display is set Fsignal will abort. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5386
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5387 #ifdef HAVE_MENUBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5388 /* Update the menubar. It is done first since it could change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5389 the menubar's visibility. This way we avoid having flashing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5390 caused by an Expose event generated by the visibility change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5391 being handled. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5392 update_frame_menubars (f);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5393 #endif /* HAVE_MENUBARS */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5394 /* widgets are similar to menus in that they can call lisp to
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5395 determine activation etc. Therefore update them before we get
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5396 into redisplay. This is primarily for connected widgets such as
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5397 radio buttons. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5398 update_frame_subwindows (f);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5399 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5400 /* Update the toolbars. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5401 update_frame_toolbars (f);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5402 #endif /* HAVE_TOOLBARS */
400
a86b2b5e0111 Import from CVS: tag r21-2-30
cvs
parents: 398
diff changeset
5403
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5404 hold_frame_size_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5406 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5407 /* Within this section, we are defenseless and assume that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5408 following cannot happen:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5409
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5410 1) garbage collection
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5411 2) Lisp code evaluation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5412 3) frame size changes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5414 We ensure (3) by calling hold_frame_size_changes(), which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5415 will cause any pending frame size changes to get put on hold
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5416 till after the end of the critical section. (1) follows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5417 automatically if (2) is met. #### Unfortunately, there are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5418 some places where Lisp code can be called within this section.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5419 We need to remove them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5420
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5421 If Fsignal() is called during this critical section, we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5422 will abort().
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5423
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5424 If garbage collection is called during this critical section,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5425 we simply return. #### We should abort instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5427 #### If a frame-size change does occur we should probably
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5428 actually be preempting redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5429
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5430 /* If we clear the frame we have to force its contents to be redrawn. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5431 if (f->clear)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5432 f->frame_changed = 1;
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
5433
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5434 /* Erase the frame before outputting its contents. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5435 if (f->clear)
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
5436 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5437 DEVMETH (d, clear_frame, (f));
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5438 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5439
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5440 /* invalidate the subwindow cache. we are going to reuse the glyphs
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5441 flag here to cause subwindows to get instantiated. This is
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5442 because subwindows changed is less strict - dealing with things
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5443 like the clicked state of button. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5444 if (!Dynarr_length (f->subwindow_cachels)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5445 || f->glyphs_changed
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5446 || f->frame_changed)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5447 reset_subwindow_cachels (f);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5448 else
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5449 mark_subwindow_cachels_as_not_updated (f);
384
bbff43aa5eb7 Import from CVS: tag r21-2-7
cvs
parents: 380
diff changeset
5450
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5451 /* Do the selected window first. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5452 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5453
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5454 /* Then do the rest. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5455 redisplay_windows (f->root_window, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5456
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5457 /* We now call the output_end routine for tty frames. We delay
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5458 doing so in order to avoid cursor flicker. So much for 100%
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5459 encapsulation. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5460 if (FRAME_TTY_P (f))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5461 DEVMETH (d, output_end, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5463 update_frame_title (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5464
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5465 f->buffers_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5466 f->clip_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5467 f->extents_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5468 f->faces_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5469 f->frame_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5470 f->glyphs_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5471 f->subwindows_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5472 f->icon_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5473 f->menubar_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5474 f->modeline_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5475 f->point_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5476 f->toolbar_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5477 f->windows_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5478 f->windows_structure_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5479 f->window_face_cache_reset = 0;
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
5480 f->echo_area_garbaged = 0;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5481
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5482 f->clear = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5483
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5484 if (!f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5485 f->size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5486
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5487 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5488
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5489 /* Allow frame size changes to occur again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5491 #### what happens if changes to other frames happen? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5492 unhold_one_frame_size_changes (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5493
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5494 map_windows (f, call_redisplay_end_triggers, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5495 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5496 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5497
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5498 /* Ensure that all frames on the given device are correctly displayed. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5499
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5500 static int
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5501 redisplay_device (struct device *d)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5502 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5503 Lisp_Object frame, frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5504 int preempted = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5505 int size_change_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5506 struct frame *f;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5507
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5508 if (DEVICE_STREAM_P (d)) /* nothing to do */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5509 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5510
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5511 /* It is possible that redisplay has been called before the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5512 device is fully initialized. If so then continue with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5513 next device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5514 if (NILP (DEVICE_SELECTED_FRAME (d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5515 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5516
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5517 REDISPLAY_PREEMPTION_CHECK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5518 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5519 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5521 /* Always do the selected frame first. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5522 frame = DEVICE_SELECTED_FRAME (d);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5523
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5524 f = XFRAME (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5525
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5526 if (f->icon_changed || f->windows_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5527 update_frame_icon (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5528
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5529 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5530 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5531 if (f->buffers_changed || f->clip_changed || f->extents_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5532 f->faces_changed || f->frame_changed || f->menubar_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5533 f->modeline_changed || f->point_changed || f->size_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5534 f->toolbar_changed || f->windows_changed || f->size_slipped ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5535 f->windows_structure_changed || f->glyphs_changed || f->subwindows_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5536 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5537 preempted = redisplay_frame (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5538 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5539
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5540 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5541 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5542
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5543 /* If the frame redisplay did not get preempted, then this flag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5544 should have gotten set to 0. It might be possible for that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5545 not to happen if a size change event were to occur at an odd
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5546 time. To make sure we don't miss anything we simply don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5547 reset the top level flags until the condition ends up being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5548 in the right state. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5549 if (f->size_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5550 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5551 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5552
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5553 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5554 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5555 f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5557 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5558 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5559
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5560 if (f->icon_changed || f->windows_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5561 update_frame_icon (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5562
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5563 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5564 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5565 if (f->buffers_changed || f->clip_changed || f->extents_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5566 f->faces_changed || f->frame_changed || f->menubar_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5567 f->modeline_changed || f->point_changed || f->size_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5568 f->toolbar_changed || f->windows_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5569 f->windows_structure_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5570 f->glyphs_changed || f->subwindows_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5571 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5572 preempted = redisplay_frame (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5573 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5574
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5575 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5576 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5577
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5578 if (f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5579 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5580 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5581 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5582
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5583 /* If we get here then we redisplayed all of our frames without
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5584 getting preempted so mark ourselves as clean. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5585 d->buffers_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5586 d->clip_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5587 d->extents_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5588 d->faces_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5589 d->frame_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5590 d->glyphs_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5591 d->subwindows_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5592 d->icon_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5593 d->menubar_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5594 d->modeline_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5595 d->point_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5596 d->toolbar_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5597 d->windows_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5598 d->windows_structure_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5599
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5600 if (!size_change_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5601 d->size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5602
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5603 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5604 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5605
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5606 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5607 restore_profiling_redisplay_flag (Lisp_Object val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5608 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5609 profiling_redisplay_flag = XINT (val);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5610 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5611 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5612
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5613 /* Ensure that all windows on all frames on all devices are displaying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5614 the current contents of their respective buffers. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5616 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5617 redisplay_without_hooks (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5618 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5619 Lisp_Object devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5620 int size_change_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5621 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5623 if (profiling_active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5624 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5625 record_unwind_protect (restore_profiling_redisplay_flag,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5626 make_int (profiling_redisplay_flag));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5627 profiling_redisplay_flag = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5628 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5630 if (asynch_device_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5631 handle_asynch_device_change ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5632
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5633 if (!buffers_changed && !clip_changed && !extents_changed &&
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5634 !faces_changed && !frame_changed && !icon_changed &&
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5635 !menubar_changed && !modeline_changed && !point_changed &&
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5636 !size_changed && !toolbar_changed && !windows_changed &&
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5637 !glyphs_changed && !subwindows_changed &&
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5638 !windows_structure_changed && !disable_preemption &&
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5639 preemption_count < max_preempts)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5640 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5641
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5642 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5643 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5644 struct device *d = XDEVICE (XCAR (devcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5645 int preempted;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5646
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5647 if (d->buffers_changed || d->clip_changed || d->extents_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5648 d->faces_changed || d->frame_changed || d->icon_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5649 d->menubar_changed || d->modeline_changed || d->point_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5650 d->size_changed || d->toolbar_changed || d->windows_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5651 d->windows_structure_changed ||
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5652 d->glyphs_changed || d->subwindows_changed)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5653 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5654 preempted = redisplay_device (d);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5655
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5656 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5657 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5658 preemption_count++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5659 RESET_CHANGED_SET_FLAGS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5660 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5661 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5662
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5663 /* See comment in redisplay_device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5664 if (d->size_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5665 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5666 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5667 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5668 preemption_count = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5670 /* Mark redisplay as accurate */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5671 buffers_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5672 clip_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5673 extents_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5674 frame_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5675 glyphs_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5676 subwindows_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5677 icon_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5678 menubar_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5679 modeline_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5680 point_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5681 toolbar_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5682 windows_changed = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5683 windows_structure_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5684 RESET_CHANGED_SET_FLAGS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5685
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5686 if (faces_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5687 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5688 mark_all_faces_as_clean ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5689 faces_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5690 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5691
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5692 if (!size_change_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5693 size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5694
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5695 reset_buffer_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5697 done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5698 unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5699 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5700
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5701 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5702 redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5703 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5704 if (last_display_warning_tick != display_warning_tick &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5705 !inhibit_warning_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5706 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5707 /* If an error occurs during this function, oh well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5708 If we report another warning, we could get stuck in an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5709 infinite loop reporting warnings. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5710 call0_trapping_errors (0, Qdisplay_warning_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5711 last_display_warning_tick = display_warning_tick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5712 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5713 /* The run_hook_trapping_errors functions are smart enough not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5714 to do any evalling if the hook function is empty, so there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5715 should not be any significant time loss. All places in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5716 C code that call redisplay() are prepared to handle GCing,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5717 so we should be OK. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5718 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5719 run_hook_trapping_errors ("Error in pre-redisplay-hook",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5720 Qpre_redisplay_hook);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5721 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5722
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5723 redisplay_without_hooks ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5724
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5725 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5726 run_hook_trapping_errors ("Error in post-redisplay-hook",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5727 Qpost_redisplay_hook);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5728 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5729 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5730
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5731
267
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
5732 static char window_line_number_buf[32];
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5733
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5734 /* Efficiently determine the window line number, and return a pointer
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5735 to its printed representation. Do this regardless of whether
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5736 line-number-mode is on. The first line in the buffer is counted as
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5737 1. If narrowing is in effect, the lines are counted from the
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5738 beginning of the visible portion of the buffer. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5739 static char *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5740 window_line_number (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5741 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5742 struct device *d = XDEVICE (XFRAME (w->frame)->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5743 struct buffer *b = XBUFFER (w->buffer);
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
5744 /* Be careful in the order of these tests. The first clause will
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5745 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
5746 This can occur when the frame title is computed really early */
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5747 Bufpos pos =
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5748 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5749 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5750 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5751 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5752 ? BUF_PT (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5753 : marker_position (w->pointm[type]));
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5754 EMACS_INT line;
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5755
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5756 line = buffer_line_number (b, pos, 1);
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5757
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5758 long_to_string (window_line_number_buf, line + 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5759
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
5760 return window_line_number_buf;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5761 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5762
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5763
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5764 /* Given a character representing an object in a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5765 specification, return a string (stored into the global array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5766 `mode_spec_bufbyte_string') with the information that object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5767 represents.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5768
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5769 This function is largely unchanged from previous versions of the
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5770 redisplay engine.
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5771
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5772 Warning! This code is also used for frame titles and can be called
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5773 very early in the device/frame update process! JV
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5774 */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5776 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5777 decode_mode_spec (struct window *w, Emchar spec, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5778 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5779 Lisp_Object obj = Qnil;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5780 CONST char *str = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5781 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5782
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5783 Dynarr_reset (mode_spec_bufbyte_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5784
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5785 switch (spec)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5786 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5787 /* print buffer name */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5788 case 'b':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5789 obj = b->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5790 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5791
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5792 /* print visited file name */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5793 case 'f':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5794 obj = b->filename;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5795 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5797 /* print the current column */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5798 case 'c':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5799 {
298
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 294
diff changeset
5800 Bufpos pt = (w == XWINDOW (Fselected_window (Qnil)))
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 294
diff changeset
5801 ? BUF_PT (b)
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 294
diff changeset
5802 : marker_position (w->pointm[type]);
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 294
diff changeset
5803 int col = column_at_point (b, pt, 1) + !!column_number_start_at_one;
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
5804 char buf[32];
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
5805
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5806 long_to_string (buf, col);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5808 Dynarr_add_many (mode_spec_bufbyte_string,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5809 (CONST Bufbyte *) buf, strlen (buf));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5810
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5811 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5812 }
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5813 /* print the file coding system */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5814 case 'C':
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
5815 #ifdef FILE_CODING
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5816 {
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
5817 Lisp_Object codesys = b->buffer_file_coding_system;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5818 /* Be very careful here not to get an error. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5819 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5820 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5821 codesys = Ffind_coding_system (codesys);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5822 if (CODING_SYSTEMP (codesys))
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
5823 obj = XCODING_SYSTEM_MNEMONIC (codesys);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5824 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5825 }
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
5826 #endif /* FILE_CODING */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5827 break;
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5828
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5829 /* print the current line number */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5830 case 'l':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5831 str = window_line_number (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5832 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5834 /* print value of mode-name (obsolete) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5835 case 'm':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5836 obj = b->mode_name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5837 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5838
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5839 /* print hyphen and frame number, if != 1 */
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5840 case 'N':
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5841 #ifdef HAVE_TTY
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5842 {
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5843 struct frame *f = XFRAME (w->frame);
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5844 if (FRAME_TTY_P (f) && f->order_count > 1 && f->order_count <= 99999999)
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5845 {
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5846 /* Naughty, naughty */
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
5847 char * writable_str = alloca_array (char, 10);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
5848 sprintf (writable_str, "-%d", f->order_count);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
5849 str = writable_str;
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5850 }
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5851 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5852 #endif /* HAVE_TTY */
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5853 break;
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5854
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5855 /* print Narrow if appropriate */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5856 case 'n':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5857 if (BUF_BEGV (b) > BUF_BEG (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5858 || BUF_ZV (b) < BUF_Z (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5859 str = " Narrow";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5860 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5862 /* print %, * or hyphen, if buffer is read-only, modified or neither */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5863 case '*':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5864 str = (!NILP (b->read_only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5865 ? "%"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5866 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5867 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5868 : "-"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5869 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5871 /* print * or hyphen -- XEmacs change to allow a buffer to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5872 read-only but still indicate whether it is modified. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5873 case '+':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5874 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5875 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5876 : (!NILP (b->read_only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5877 ? "%"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5878 : "-"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5879 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5880
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5881 /* #### defined in 19.29 decode_mode_spec, but not in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5882 modeline-format doc string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5883 /* This differs from %* in that it ignores read-only-ness. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5884 case '&':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5885 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5886 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5887 : "-");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5888 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5889
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5890 /* print process status */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5891 case 's':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5892 obj = Fget_buffer_process (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5893 if (NILP (obj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5894 str = GETTEXT ("no process");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5895 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5896 obj = Fsymbol_name (Fprocess_status (obj));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5897 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5898
227
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 223
diff changeset
5899 /* Print name of selected frame. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5900 case 'S':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5901 obj = XFRAME (w->frame)->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5902 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5903
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5904 /* indicate TEXT or BINARY */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5905 case 't':
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
5906 /* #### NT does not use this any more. Now what? */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5907 str = "T";
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5908 break;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5909
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5910 /* print percent of buffer above top of window, or Top, Bot or All */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5911 case 'p':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5912 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5913 Bufpos pos = marker_position (w->start[type]);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5914 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5915
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5916 /* This had better be while the desired lines are being done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5917 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5918 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5919 if (pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5920 str = "All";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5921 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5922 str = "Bottom";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5923 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5924 else if (pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5925 str = "Top";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5926 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5927 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5928 /* This hard limit is ok since the string it will hold has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5929 fixed maximum length of 3. But just to be safe... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5930 char buf[10];
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5931
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5932 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5933
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5934 /* We can't normally display a 3-digit number, so get us a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5935 2-digit number that is close. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5936 if (total == 100)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5937 total = 99;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5938
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5939 sprintf (buf, "%2d%%", total);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5940 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5941 strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5942
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5943 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5944 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5945 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5946 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5947
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5948 /* print percent of buffer above bottom of window, perhaps plus
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5949 Top, or print Bottom or All */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5950 case 'P':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5951 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5952 Bufpos toppos = marker_position (w->start[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5953 Bufpos botpos = BUF_Z (b) - w->window_end_pos[type];
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5954 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5955
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5956 /* botpos is only accurate as of the last redisplay, so we can
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5957 only treat it as a hint. In particular, after erase-buffer,
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5958 botpos may be negative. */
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5959 if (botpos < toppos)
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5960 botpos = toppos;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5961
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5962 if (botpos >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5963 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5964 if (toppos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5965 str = "All";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5966 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5967 str = "Bottom";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5968 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5969 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5970 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5971 /* This hard limit is ok since the string it will hold has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5972 fixed maximum length of around 6. But just to be safe... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5973 char buf[10];
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5974
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5975 total = ((botpos - BUF_BEGV (b)) * 100 + total - 1) / total;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5977 /* We can't normally display a 3-digit number, so get us a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5978 2-digit number that is close. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5979 if (total == 100)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5980 total = 99;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5982 if (toppos <= BUF_BEGV (b))
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5983 sprintf (buf, "Top%2d%%", total);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5984 else
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
5985 sprintf (buf, "%2d%%", total);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5987 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5988 strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5990 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5991 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5992 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5993 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5994
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5995 /* print % */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5996 case '%':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5997 str = "%";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5998 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6000 /* print one [ for each recursive editing level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6001 case '[':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6002 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6003 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6005 if (command_loop_level > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6006 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6007 str = "[[[... ";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6008 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6009 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6011 for (i = 0; i < command_loop_level; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6012 Dynarr_add (mode_spec_bufbyte_string, '[');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6013
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6014 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6015 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6016
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6017 /* print one ] for each recursive editing level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6018 case ']':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6019 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6020 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6022 if (command_loop_level > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6023 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6024 str = "...]]]";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6025 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6026 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6027
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6028 for (i = 0; i < command_loop_level; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6029 Dynarr_add (mode_spec_bufbyte_string, ']');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6030
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6031 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6032 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6033
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6034 /* print infinitely many dashes -- handle at top level now */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6035 case '-':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6036 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6038 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6039
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6040 if (STRINGP (obj))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
6041 Dynarr_add_many (mode_spec_bufbyte_string,
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
6042 XSTRING_DATA (obj),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
6043 XSTRING_LENGTH (obj));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6044 else if (str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6045 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) str, strlen (str));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6047 decode_mode_spec_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6048 Dynarr_add (mode_spec_bufbyte_string, '\0');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6049 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6050
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
6051 /* Given a display line, free all of its data structures. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6052
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6053 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6054 free_display_line (struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6055 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6056 int block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6057
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6058 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6059 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6060 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6061 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6062 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6063
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6064 Dynarr_free (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6065 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6066
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6067 Dynarr_free (dl->display_blocks);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6068 dl->display_blocks = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6069 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6070
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6071 if (dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6072 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6073 Dynarr_free (dl->left_glyphs);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6074 dl->left_glyphs = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6075 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6076
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6077 if (dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6078 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6079 Dynarr_free (dl->right_glyphs);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6080 dl->right_glyphs = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6081 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6082 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6084
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6085 /* Given an array of display lines, free them and all data structures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6086 contained within them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6087
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6088 static void
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6089 free_display_lines (display_line_dynarr *dla)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6090 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6091 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6092
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6093 for (line = 0; line < Dynarr_largest (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6094 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6095 free_display_line (Dynarr_atp (dla, line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6096 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6097
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6098 Dynarr_free (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6099 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6101 /* Call internal free routine for each set of display lines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6103 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6104 free_display_structs (struct window_mirror *mir)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6105 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6106 if (mir->current_display_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6107 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6108 free_display_lines (mir->current_display_lines);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6109 mir->current_display_lines = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6110 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6112 if (mir->desired_display_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6114 free_display_lines (mir->desired_display_lines);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6115 mir->desired_display_lines = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6116 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6117 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6120 static void
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6121 mark_glyph_block_dynarr (glyph_block_dynarr *gba, void (*markobj) (Lisp_Object))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6122 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6123 if (gba)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6124 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6125 glyph_block *gb = Dynarr_atp (gba, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6126 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6127
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6128 for (; gb < gb_last; gb++)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6129 {
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
6130 if (!NILP (gb->glyph))
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6131 markobj (gb->glyph);
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
6132 if (!NILP (gb->extent))
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6133 markobj (gb->extent);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6134 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6135 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6136 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6137
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6138 static void
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6139 mark_redisplay_structs (display_line_dynarr *dla, void (*markobj) (Lisp_Object))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6140 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6141 display_line *dl = Dynarr_atp (dla, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6142 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6143
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6144 for (; dl < dl_last; dl++)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6145 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6146 display_block_dynarr *dba = dl->display_blocks;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6147 display_block *db = Dynarr_atp (dba, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6148 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6149
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6150 for (; db < db_last; db++)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6151 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6152 rune_dynarr *ra = db->runes;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6153 rune *r = Dynarr_atp (ra, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6154 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6155
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6156 for (; r < r_last; r++)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6157 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6158 if (r->type == RUNE_DGLYPH)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6159 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6160 if (!NILP (r->object.dglyph.glyph))
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6161 markobj (r->object.dglyph.glyph);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6162 if (!NILP (r->object.dglyph.extent))
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6163 markobj (r->object.dglyph.extent);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6164 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6165 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6166 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6167
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6168 mark_glyph_block_dynarr (dl->left_glyphs, markobj);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6169 mark_glyph_block_dynarr (dl->right_glyphs, markobj);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6170 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6171 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6173 static void
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6174 mark_window_mirror (struct window_mirror *mir, void (*markobj)(Lisp_Object))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 384
diff changeset
6175 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6176 mark_redisplay_structs (mir->current_display_lines, markobj);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6177 mark_redisplay_structs (mir->desired_display_lines, markobj);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6179 if (mir->next)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6180 mark_window_mirror (mir->next, markobj);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6182 if (mir->hchild)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6183 mark_window_mirror (mir->hchild, markobj);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6184 else if (mir->vchild)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6185 mark_window_mirror (mir->vchild, markobj);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6186 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6187
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6188 void
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6189 mark_redisplay (void (*markobj)(Lisp_Object))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6190 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6191 Lisp_Object frmcons, devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6193 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6194 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6195 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6196 update_frame_window_mirror (f);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6197 mark_window_mirror (f->root_mirror, markobj);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6198 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6199 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6201 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6202 Line Start Cache Description and Rationale
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6204 The traditional scrolling code in Emacs breaks in a variable height world.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6205 It depends on the key assumption that the number of lines that can be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6206 displayed at any given time is fixed. This led to a complete separation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6207 of the scrolling code from the redisplay code. In order to fully support
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6208 variable height lines, the scrolling code must actually be tightly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6209 integrated with redisplay. Only redisplay can determine how many lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6210 will be displayed on a screen for any given starting point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6211
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6212 What is ideally wanted is a complete list of the starting buffer position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6213 for every possible display line of a buffer along with the height of that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6214 display line. Maintaining such a full list would be very expensive. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6215 settle for having it include information for all areas which we happen to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6216 generate anyhow (i.e. the region currently being displayed) and for those
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6217 areas we need to work with.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6219 In order to ensure that the cache accurately represents what redisplay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6220 would actually show, it is necessary to invalidate it in many situations.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6221 If the buffer changes, the starting positions may no longer be correct.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6222 If a face or an extent has changed then the line heights may have altered.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6223 These events happen frequently enough that the cache can end up being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6224 constantly disabled. With this potentially constant invalidation when is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6225 the cache ever useful?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6226
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6227 Even if the cache is invalidated before every single usage, it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6228 necessary. Scrolling often requires knowledge about display lines which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6229 are actually above or below the visible region. The cache provides a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6230 convenient light-weight method of storing this information for multiple
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6231 display regions. This knowledge is necessary for the scrolling code to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6232 always obey the First Golden Rule of Redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6234 If the cache already contains all of the information that the scrolling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6235 routines happen to need so that it doesn't have to go generate it, then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6236 are able to obey the Third Golden Rule of Redisplay. The first thing we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6237 do to help out the cache is to always add the displayed region. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6238 region had to be generated anyway, so the cache ends up getting the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6239 information basically for free. In those cases where a user is simply
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6240 scrolling around viewing a buffer there is a high probability that this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6241 sufficient to always provide the needed information. The second thing we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6242 can do is be smart about invalidating the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6244 TODO -- Be smart about invalidating the cache. Potential places:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6245
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6246 + Insertions at end-of-line which don't cause line-wraps do not alter the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6247 starting positions of any display lines. These types of buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6248 modifications should not invalidate the cache. This is actually a large
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6249 optimization for redisplay speed as well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6251 + Buffer modifications frequently only affect the display of lines at and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6252 below where they occur. In these situations we should only invalidate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6253 the part of the cache starting at where the modification occurs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6254
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6255 In case you're wondering, the Second Golden Rule of Redisplay is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6256 applicable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6257 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6259 /* This will get used quite a bit so we don't want to be constantly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6260 allocating and freeing it. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6261 line_start_cache_dynarr *internal_cache;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6263 /* Makes internal_cache represent the TYPE display structs and only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6264 the TYPE display structs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6265
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6266 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6267 update_internal_cache_list (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6268 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6269 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6270 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6271
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6272 Dynarr_reset (internal_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6273 for (line = 0; line < Dynarr_length (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6274 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6275 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6276
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6277 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6278 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6279 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6280 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6281 struct line_start_cache lsc;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6282
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6283 lsc.start = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6284 lsc.end = dl->end_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6285 lsc.height = dl->ascent + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6286
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6287 Dynarr_add (internal_cache, lsc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6288 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6289 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6290 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6291
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6292 /* Reset the line cache if necessary. This should be run at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6293 beginning of any function which access the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6295 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6296 validate_line_start_cache (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6297 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6298 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6299 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6300
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6301 if (!w->line_cache_validation_override)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6302 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6303 /* f->extents_changed used to be in here because extent face and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6304 size changes can cause text shifting. However, the extent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6305 covering the region is constantly having its face set and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6306 priority altered by the mouse code. This means that the line
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
6307 start cache is constantly being invalidated. This is bad
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6308 since the mouse code also triggers heavy usage of the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6309 Since it is an unlikely that f->extents being changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6310 indicates that the cache really needs to be updated and if it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6311 does redisplay will catch it pretty quickly we no longer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6312 invalidate the cache if it is set. This greatly speeds up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6313 dragging out regions with the mouse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6314 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6315 || f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6316 || f->clip_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6317 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6318 Dynarr_reset (w->line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6319 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6320 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6321 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6323 /* Return the very first buffer position contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6324 window's cache, or -1 if the cache is empty. Assumes that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6325 cache is valid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6327 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6328 line_start_cache_start (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6329 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6330 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6331
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6332 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6333 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6334 else
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6335 return Dynarr_atp (cache, 0)->start;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6336 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6337
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6338 /* Return the very last buffer position contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6339 window's cache, or -1 if the cache is empty. Assumes that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6340 cache is valid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6342 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6343 line_start_cache_end (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6344 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6345 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6346
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6347 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6348 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6349 else
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6350 return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6351 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6352
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6353 /* Return the index of the line POINT is contained within in window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6354 W's line start cache. It will enlarge the cache or move the cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6355 window in order to have POINT be present in the cache. MIN_PAST is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6356 a guarantee of the number of entries in the cache present on either
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6357 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6358 then it will be treated as 0, but the cache window will not be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6359 allowed to shift. Returns -1 if POINT cannot be found in the cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6360 for any reason. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6361
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6362 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6363 point_in_line_start_cache (struct window *w, Bufpos point, int min_past)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6364 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6365 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6366 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6367 unsigned int top, bottom, pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6369 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6370 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6371
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6372 /* Let functions pass in negative values, but we still treat -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6373 specially. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6374 /* #### bogosity alert */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6375 if (min_past < 0 && min_past != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6376 min_past = -min_past;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6378 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6379 || line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6380 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6381 int loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6382 int win_char_height = window_char_height (w, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6383
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6384 /* Occasionally we get here with a 0 height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6385 window. find_next_newline_no_quit will abort if we pass it a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6386 count of 0 so handle that case. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6387 if (!win_char_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6388 win_char_height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6390 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6391 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6392 Bufpos from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6393 Bufpos to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6394
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6395 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6396
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6397 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6398 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6399 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6400 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6401 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6402 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6404 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6406 loop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6407 while (line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6408 && (loop < cache_adjustment || min_past == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6409 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6410 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6412 from = line_start_cache_start (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6413 if (from <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6414 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6415
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6416 from = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6417 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6419 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6420 loop++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6421 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6423 if (line_start_cache_start (w) > point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6424 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6425 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6427 from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6428 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6429 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6430 to = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6431 from = to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6432 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6433 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6434 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6435 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6436
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6437 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6438 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6439
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6440 loop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6441 while (line_start_cache_end (w) < point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6442 && (loop < cache_adjustment || min_past == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6443 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6444 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6445
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6446 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6447 if (to >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6448 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6450 from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6451 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6453 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6454 loop++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6455 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6456
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6457 if (line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6458 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6459 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6461 from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6462 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6463 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6464 to = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6465 from = to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6466 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6467 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6468 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6469 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6471 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6472 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6473 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6475 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6477 if (min_past == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6478 min_past = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6479
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6480 /* This could happen if the buffer is narrowed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6481 if (line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6482 || line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6483 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6484 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6485 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6486 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6488 find_point_loop:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6489
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6490 top = Dynarr_length (cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6491 bottom = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6492
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6493 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6494 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6495 unsigned int new_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6496 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6497
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6498 pos = (bottom + top + 1) >> 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6499 start = Dynarr_atp (cache, pos)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6500 end = Dynarr_atp (cache, pos)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6502 if (point >= start && point <= end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6503 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6504 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6505 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6506 Bufpos from =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6507 find_next_newline_no_quit (b, line_start_cache_start (w),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6508 -min_past - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6509 Bufpos to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6510
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6511 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6512 goto find_point_loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6513 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6514 else if ((Dynarr_length (cache) - pos - 1) < min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6515 && line_start_cache_end (w) < BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6516 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6517 Bufpos from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6518 Bufpos to = find_next_newline_no_quit (b, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6519 (min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6520 ? min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6521 : 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6523 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6524 goto find_point_loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6525 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6526 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6527 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6528 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6529 return pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6530 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6531 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6532 else if (point > end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6533 bottom = pos + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6534 else if (point < start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6535 top = pos - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6536 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6537 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6538
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6539 new_pos = (bottom + top + 1) >> 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6540 if (pos == new_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6541 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6542 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6543 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6544 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6545 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6546 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6547
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6548 /* Return a boolean indicating if POINT would be visible in window W
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6549 if display of the window was to begin at STARTP. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6550
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6551 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6552 point_would_be_visible (struct window *w, Bufpos startp, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6553 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6554 struct buffer *b = XBUFFER (w->buffer);
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6555 int pixpos = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6556 int bottom = WINDOW_TEXT_HEIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6557 int start_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6559 /* If point is before the intended start it obviously can't be visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6560 if (point < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6561 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6562
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6563 /* If point or start are not in the accessible buffer range, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6564 fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6565 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6566 || point < BUF_BEGV (b) || point > BUF_ZV (b))
267
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
6567 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6568
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6569 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6570 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6571
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6572 start_elt = point_in_line_start_cache (w, startp, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6573 if (start_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6574 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6575 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6576 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6577 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6578
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6579 assert (line_start_cache_start (w) <= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6580 && line_start_cache_end (w) >= startp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6581
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6582 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6583 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6584 int height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6586 /* Expand the cache if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6587 if (start_elt == Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6588 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6589 Bufpos old_startp =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6590 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6592 start_elt = point_in_line_start_cache (w, old_startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6593 window_char_height (w, 0));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6595 /* We've already actually processed old_startp, so increment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6596 immediately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6597 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6598
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6599 /* If this happens we didn't add any extra elements. Bummer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6600 if (start_elt == Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6601 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6602 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6603 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6604 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6605 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6607 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6609 if (pixpos + height > bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6610 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6611 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6612 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6613 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6614 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6615 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6616 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6618 pixpos += height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6619 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6620 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6621 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6622 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6623 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6624
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6625 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6626 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6627 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6629 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6630 the buffer position at the beginning or end of the last line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6631 displayed. The end of the last line is also know as the window end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6632 position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6633
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6634 #### With a little work this could probably be reworked as just a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6635 call to start_with_line_at_pixpos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6636
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6637 static Bufpos
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6638 start_end_of_last_line (struct window *w, Bufpos startp, int end)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6639 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6640 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6641 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6642 int pixpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6643 int bottom = WINDOW_TEXT_HEIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6644 Bufpos cur_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6645 int start_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6647 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6648 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6649
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6650 if (startp < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6651 startp = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6652 else if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6653 startp = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6654 cur_start = startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6655
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6656 start_elt = point_in_line_start_cache (w, cur_start, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6657 if (start_elt == -1)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6658 abort (); /* this had better never happen */
371
cc15677e0335 Import from CVS: tag r21-2b1
cvs
parents: 367
diff changeset
6659
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6660 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6661 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6662 int height = Dynarr_atp (cache, start_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6663
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6664 cur_start = Dynarr_atp (cache, start_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6665
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6666 if (pixpos + height > bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6667 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6668 /* Adjust for any possible clip. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6669 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6670 start_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6672 if (start_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6673 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6674 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6675 if (end)
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6676 return BUF_ZV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6677 else
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6678 return BUF_BEGV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6679 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6680 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6681 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6682 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6683 if (end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6684 return Dynarr_atp (cache, start_elt)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6685 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6686 return Dynarr_atp (cache, start_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6687 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6688 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6689
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6690 pixpos += height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6691 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6692 if (start_elt == Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6693 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6694 Bufpos from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6695 int win_char_height = window_char_height (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6696 Bufpos to = find_next_newline_no_quit (b, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6697 (win_char_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6698 ? win_char_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6699 : 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6700
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6701 /* We've hit the end of the bottom so that's what it is. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6702 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6703 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6704 w->line_cache_validation_override--;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6705 return BUF_ZV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6706 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6707
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6708 update_line_start_cache (w, from, to, BUF_PT (b), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6710 /* Updating the cache invalidates any current indexes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6711 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6712 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6713 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6714 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6715
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6716 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6717 the buffer position at the beginning of the last line displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6718
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6719 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6720 start_of_last_line (struct window *w, Bufpos startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6721 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6722 return start_end_of_last_line (w, startp, 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6723 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6724
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6725 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6726 the buffer position at the end of the last line displayed. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6727 also know as the window end position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6728
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6729 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6730 end_of_last_line (struct window *w, Bufpos startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6731 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6732 return start_end_of_last_line (w, startp, 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6733 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6734
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6735 /* For window W, what does the starting position have to be so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6736 the line containing POINT will cover pixel position PIXPOS. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6737
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6738 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6739 start_with_line_at_pixpos (struct window *w, Bufpos point, int pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6740 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6741 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6742 int cur_elt;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6743 Bufpos cur_pos, prev_pos = point;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6744 int point_line_height;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6745 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6746
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6747 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6748 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6750 cur_elt = point_in_line_start_cache (w, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6751 /* #### See comment in update_line_start_cache about big minibuffers. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6752 if (cur_elt < 0)
267
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
6753 {
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
6754 w->line_cache_validation_override--;
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
6755 return point;
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
6756 }
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6757
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6758 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6759
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6760 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6761 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6762 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6764 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6765
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6766 /* Do not take into account the value of vertical_clip here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6767 That is the responsibility of the calling functions. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6768 if (pixheight < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6769 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6770 w->line_cache_validation_override--;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6771 if (-pixheight > point_line_height)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6772 /* We can't make the target line cover pixpos, so put it
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6773 above pixpos. That way it will at least be visible. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
6774 return prev_pos;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6775 else
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6776 return cur_pos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6777 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6779 cur_elt--;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6780 if (cur_elt < 0)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6781 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6782 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6783 int win_char_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6784
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6785 if (cur_pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6786 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6787 w->line_cache_validation_override--;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6788 return BUF_BEGV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6789 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6791 win_char_height = window_char_height (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6792 if (!win_char_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6793 win_char_height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6794
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6795 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6796 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6797 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6798
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6799 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6800 assert (cur_elt >= 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6801 }
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6802 prev_pos = cur_pos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6803 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6804 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6805
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6806 /* For window W, what does the starting position have to be so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6807 the line containing point is on display line LINE. If LINE is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6808 positive it is considered to be the number of lines from the top of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6809 the window (0 is the top line). If it is negative the number is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6810 considered to be the number of lines from the bottom (-1 is the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6811 bottom line). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6813 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6814 start_with_point_on_display_line (struct window *w, Bufpos point, int line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6815 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6816 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6817 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6818
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6819 if (line >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6820 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6821 int cur_elt = point_in_line_start_cache (w, point, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6822
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6823 if (cur_elt - line < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6824 cur_elt = 0; /* Hit the top */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6825 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6826 cur_elt -= line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6827
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6828 w->line_cache_validation_override--;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6829 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6830 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6831 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6832 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6833 /* The calculated value of pixpos is correct for the bottom line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6834 or what we want when line is -1. Therefore we subtract one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6835 because we have already handled one line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6836 int new_line = -line - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6837 int cur_elt = point_in_line_start_cache (w, point, new_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6838 int pixpos = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6839 Bufpos retval, search_point;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6840
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6841 /* If scroll_on_clipped_lines is false, the last "visible" line of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6842 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
6843 If s_o_c_l is true, then we don't want to count a clipped
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
6844 line, so back up from the bottom by the height of the line
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6845 containing point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6846 if (scroll_on_clipped_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6847 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6848 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6849 pixpos -= 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6850
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6851 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6852 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6853 /* Hit the bottom of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6854 int adjustment =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6855 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
6856 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6857 int defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6858
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6859 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6860 default_face_height_and_width (window, &defheight, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6862 cur_elt = Dynarr_length (w->line_start_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6863
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6864 pixpos -= (adjustment * defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6865 if (pixpos < WINDOW_TEXT_TOP (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6866 pixpos = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6867 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6868 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6869 cur_elt = cur_elt + new_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6871 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6872
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6873 retval = start_with_line_at_pixpos (w, search_point, pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6874 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6875 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6876 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6877 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6878
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6879 /* This is used to speed up vertical scrolling by caching the known
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6880 buffer starting positions for display lines. This allows the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6881 scrolling routines to avoid costly calls to regenerate_window. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6882 NO_REGEN is true then it will only add the values in the DESIRED
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6883 display structs which are in the given range.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6884
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6885 Note also that the FROM/TO values are minimums. It is possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6886 that this function will actually add information outside of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6887 lines containing those positions. This can't hurt but it could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6888 possibly help.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6889
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6890 #### We currently force the cache to have only 1 contiguous region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6891 It might help to make the cache a dynarr of caches so that we can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6892 cover more areas. This might, however, turn out to be a lot of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6893 overhead for too little gain. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6894
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6895 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6896 update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6897 Bufpos point, int no_regen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6898 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6899 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6900 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6901 Bufpos low_bound, high_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6902
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6903 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6904 w->line_cache_validation_override++;
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6905 updating_line_start_cache = 1;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6906
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6907 if (from < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6908 from = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6909 if (to > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6910 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6911
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6912 if (from > to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6913 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6914 updating_line_start_cache = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6915 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6916 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6917 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6918
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6919 if (Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6920 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6921 low_bound = line_start_cache_start (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6922 high_bound = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6923
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6924 /* Check to see if the desired range is already in the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6925 if (from >= low_bound && to <= high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6926 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6927 updating_line_start_cache = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6928 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6929 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6930 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6931
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6932 /* Check to make sure that the desired range is adjacent to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6933 current cache. If not, invalidate the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6934 if (to < low_bound || from > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6935 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6936 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6937 low_bound = high_bound = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6938 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6939 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6940 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6941 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6942 low_bound = high_bound = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6943 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6944
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6945 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6947 /* This could be integrated into the next two sections, but it is easier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6948 to follow what's going on by having it separate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6949 if (no_regen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6950 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6951 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6953 update_internal_cache_list (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6954 if (!Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6955 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6956 updating_line_start_cache = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6957 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6958 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6959 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6960
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6961 start = Dynarr_atp (internal_cache, 0)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6962 end =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6963 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6964
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6965 /* We aren't allowed to generate additional information to fill in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6966 gaps, so if the DESIRED structs don't overlap the cache, reset the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6967 cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6968 if (Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6969 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6970 if (end < low_bound || start > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6971 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6972
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6973 /* #### What should really happen if what we are doing is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6974 extending a line (the last line)? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6975 if (Dynarr_length (cache) == 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6976 && Dynarr_length (internal_cache) == 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6977 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6978 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6979
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6980 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6981 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6982 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6983 Dynarr_length (internal_cache));
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6984 updating_line_start_cache = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6985 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6986 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6987 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6988
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6989 /* An extra check just in case the calling function didn't pass in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6990 the bounds of the DESIRED structs in the first place. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6991 if (start >= low_bound && end <= high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6992 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
6993 updating_line_start_cache = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6994 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6995 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6996 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6997
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6998 /* At this point we know that the internal cache partially overlaps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6999 the main cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7000 if (start < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7001 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7002 int ic_elt = Dynarr_length (internal_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7003 while (ic_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7004 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7005 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7006 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7007 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7008 ic_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7009 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7011 if (!(ic_elt >= 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7012 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7013 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7014 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7015 Dynarr_length (internal_cache));
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7016 updating_line_start_cache = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7017 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7018 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7019 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7020
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7021 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7022 ic_elt + 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7023 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7024
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7025 if (end > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7026 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7027 int ic_elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7028
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7029 while (ic_elt < Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7030 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7031 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7032 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7033 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7034 ic_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7035 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7037 if (!(ic_elt < Dynarr_length (internal_cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7038 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7039 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7040 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7041 Dynarr_length (internal_cache));
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7042 updating_line_start_cache = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7043 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7044 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7045 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7047 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7048 Dynarr_length (internal_cache) - ic_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7049 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7050
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7051 updating_line_start_cache = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7052 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7053 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7054 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7055
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7056 if (!Dynarr_length (cache) || from < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7057 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7058 Bufpos startp = find_next_newline_no_quit (b, from, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7059 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7060 int old_lb = low_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7061
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7062 while (startp < old_lb || low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7063 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7064 int ic_elt;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7065 Bufpos new_startp;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7066
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7067 regenerate_window (w, startp, point, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7068 update_internal_cache_list (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7069
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7070 /* If this assert is triggered then regenerate_window failed
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7071 to layout a single line. That is not supposed to be
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7072 possible because we impose a minimum height on the buffer
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7073 and override vertical clip when we are in here. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7074 /* #### Ah, but it is because the window may temporarily
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7075 exist but not have any lines at all if the minibuffer is
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7076 real big. Look into that situation better. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7077 if (!Dynarr_length (internal_cache))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7078 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7079 if (old_lb == -1 && low_bound == -1)
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7080 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7081 updating_line_start_cache = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7082 w->line_cache_validation_override--;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7083 return;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7084 }
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7085
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7086 assert (Dynarr_length (internal_cache));
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7087 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7088 assert (startp == Dynarr_atp (internal_cache, 0)->start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7090 ic_elt = Dynarr_length (internal_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7091 if (low_bound != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7092 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7093 while (ic_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7094 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7095 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7096 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7097 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7098 ic_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7099 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7100 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7101 assert (ic_elt >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7102
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7103 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7104
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7105 /*
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7106 * Handle invisible text properly:
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
7107 * If the last line we're inserting has the same end as the
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7108 * line before which it will be added, merge the two lines.
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7109 */
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7110 if (Dynarr_length (cache) &&
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7111 Dynarr_atp (internal_cache, ic_elt)->end ==
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7112 Dynarr_atp (cache, marker)->end)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7113 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7114 Dynarr_atp (cache, marker)->start
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7115 = Dynarr_atp (internal_cache, ic_elt)->start;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7116 Dynarr_atp (cache, marker)->height
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7117 = Dynarr_atp (internal_cache, ic_elt)->height;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7118 ic_elt--;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7119 }
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7120
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7121 if (ic_elt >= 0) /* we still have lines to add.. */
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7122 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7123 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7124 ic_elt + 1, marker);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7125 marker += (ic_elt + 1);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7126 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7127
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7128 if (startp < low_bound || low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7129 low_bound = startp;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7130 startp = new_startp;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7131 if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7132 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7133 updating_line_start_cache = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7134 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7135 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7136 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7137 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7138 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7139
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7140 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7141 assert (from >= low_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7143 /* Readjust the high_bound to account for any changes made while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7144 correcting the low_bound. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7145 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7146
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7147 if (to > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7148 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7149 Bufpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7151 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7152 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7153 regenerate_window (w, startp, point, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7154 update_internal_cache_list (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7156 /* See comment above about regenerate_window failing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7157 assert (Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7159 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7160 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7161 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7162 startp = high_bound + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7163 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7164 while (to > high_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7165 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7166
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7167 updating_line_start_cache = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7168 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7169 assert (to <= high_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7170 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7173 /* Given x and y coordinates in characters, relative to a window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7174 return the pixel location corresponding to those coordinates. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7175 pixel location returned is the center of the given character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7176 position. The pixel values are generated relative to the window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7177 not the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7179 The modeline is considered to be part of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7180
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7181 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7182 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7183 int *pix_x, int *pix_y)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7184 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7185 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7186 int num_disp_lines, modeline;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7187 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7188 int defheight, defwidth;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7190 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7191 default_face_height_and_width (window, &defheight, &defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7193 /* If we get a bogus value indicating somewhere above or to the left of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7194 the window, use the first window line or character position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7195 instead. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7196 if (char_y < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7197 char_y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7198 if (char_x < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7199 char_x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7201 num_disp_lines = Dynarr_length (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7202 modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7203 if (num_disp_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7204 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7205 if (Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7206 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7207 num_disp_lines--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7208 modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7209 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7210 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7211
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7212 /* First check if the y position intersects the display lines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7213 if (char_y < num_disp_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7214 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7215 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7216 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7218 *pix_y = (dl->ypos - dl->ascent +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7219 ((unsigned int) (dl->ascent + dl->descent - dl->clip) >> 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7221 if (char_x < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7222 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7223 struct rune *rb = Dynarr_atp (db->runes, char_x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7225 *pix_x = rb->xpos + (rb->width >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7226 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7227 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7228 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7229 int last_rune = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7230 struct rune *rb = Dynarr_atp (db->runes, last_rune);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7232 char_x -= last_rune;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7234 *pix_x = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7235 *pix_x += ((char_x - 1) * defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7236 *pix_x += (defwidth >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7237 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7238 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7239 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7240 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7241 /* It didn't intersect, so extrapolate. #### For now, we include the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7242 modeline in this since we don't have true character positions in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7243 it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7244
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7245 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7246 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7248 char_y -= num_disp_lines;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7249
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7250 if (Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7251 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7252 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7253 *pix_y = dl->ypos + dl->descent - dl->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7254 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7255 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7256 *pix_y = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7257
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7258 *pix_y += (char_y * defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7259 *pix_y += (defheight >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7260
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7261 *pix_x = WINDOW_TEXT_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7262 /* Don't adjust by one because this is still the unadjusted value. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7263 *pix_x += (char_x * defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7264 *pix_x += (defwidth >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7265 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7266
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7267 if (*pix_x > w->pixel_left + w->pixel_width)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
7268 *pix_x = w->pixel_left + w->pixel_width;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7269 if (*pix_y > w->pixel_top + w->pixel_height)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
7270 *pix_y = w->pixel_top + w->pixel_height;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7271
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7272 *pix_x -= w->pixel_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7273 *pix_y -= w->pixel_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7274 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7275
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7276 /* Given a display line and a position, determine if there is a glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7277 there and return information about it if there is. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7278
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7279 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7280 get_position_object (struct display_line *dl, Lisp_Object *obj1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7281 Lisp_Object *obj2, int x_coord, int *low_x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7282 int *high_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7283 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7284 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7285 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7286 int block =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7287 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7289 /* We use get_next_display_block to get the actual display block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7290 that would be displayed at x_coord. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7291
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7292 if (block == NO_BLOCK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7293 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7294 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7295 db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7297 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7298 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7299 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7300
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7301 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7302 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7303 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7304 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7305 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7306 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7307 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7308 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7309 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7310 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7311 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7312 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7314 if (low_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7315 *low_x_coord = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7316 if (high_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7317 *high_x_coord = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7319 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7320 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7321 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7322 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7323
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7324 #define UPDATE_CACHE_RETURN \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7325 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7326 d->pixel_to_glyph_cache.valid = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7327 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7328 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7329 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7330 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7331 d->pixel_to_glyph_cache.frame = f; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7332 d->pixel_to_glyph_cache.col = *col; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7333 d->pixel_to_glyph_cache.row = *row; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7334 d->pixel_to_glyph_cache.obj_x = *obj_x; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7335 d->pixel_to_glyph_cache.obj_y = *obj_y; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7336 d->pixel_to_glyph_cache.w = *w; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7337 d->pixel_to_glyph_cache.bufpos = *bufpos; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7338 d->pixel_to_glyph_cache.closest = *closest; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7339 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7340 d->pixel_to_glyph_cache.obj1 = *obj1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7341 d->pixel_to_glyph_cache.obj2 = *obj2; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7342 d->pixel_to_glyph_cache.retval = position; \
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
7343 RETURN_SANS_WARNINGS position; \
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7344 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7346 /* Given x and y coordinates in pixels relative to a frame, return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7347 information about what is located under those coordinates.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7349 The return value will be one of:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7351 OVER_TOOLBAR: over one of the 4 frame toolbars
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7352 OVER_MODELINE: over a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7353 OVER_BORDER: over an internal border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7354 OVER_NOTHING: over the text area, but not over text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7355 OVER_OUTSIDE: outside of the frame border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7356 OVER_TEXT: over text in the text area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7358 OBJ1 is one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7360 -- a toolbar button
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7361 -- a glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7362 -- nil if the coordinates are not over a glyph or a toolbar button.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7363
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7364 OBJ2 is one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7365
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7366 -- an extent, if the coordinates are over a glyph in the text area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7367 -- nil otherwise.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7369 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7370 equivalent coordinates relative to the upper-left corner of the glyph.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7371
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7372 If the coordinates are over a character, OBJ_X and OBJ_Y give the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7373 equivalent coordinates relative to the upper-left corner of the character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7374
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7375 Otherwise, OBJ_X and OBJ_Y are undefined.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7376 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7378 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7379 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7380 int *col, int *row, int *obj_x, int *obj_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7381 struct window **w, Bufpos *bufpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7382 Bufpos *closest, Charcount *modeline_closest,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7383 Lisp_Object *obj1, Lisp_Object *obj2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7384 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7385 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7386 struct pixel_to_glyph_translation_cache *cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7387 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7388 int frm_left, frm_right, frm_top, frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7389 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7390 int position = OVER_NOTHING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7391 int device_check_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7392 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7393
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7394 /* This is a safety valve in case this got called with a frame in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7395 the middle of being deleted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7396 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7397 {
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7398 device_check_failed = 1;
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7399 d = NULL, cache = NULL; /* Warning suppression */
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7400 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7401 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7402 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7403 d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7404 cache = &d->pixel_to_glyph_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7405 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7407 if (!device_check_failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7408 && cache->valid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7409 && cache->frame == f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7410 && cache->low_x_coord <= x_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7411 && cache->high_x_coord > x_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7412 && cache->low_y_coord <= y_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7413 && cache->high_y_coord > y_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7414 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7415 *col = cache->col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7416 *row = cache->row;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7417 *obj_x = cache->obj_x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7418 *obj_y = cache->obj_y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7419 *w = cache->w;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7420 *bufpos = cache->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7421 *closest = cache->closest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7422 *modeline_closest = cache->modeline_closest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7423 *obj1 = cache->obj1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7424 *obj2 = cache->obj2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7425
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7426 return cache->retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7427 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7428 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7429 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7430 *col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7431 *row = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7432 *obj_x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7433 *obj_y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7434 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7435 *bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7436 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7437 *modeline_closest = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7438 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7439 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7441 low_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7442 high_x_coord = x_coord + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7443 low_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7444 high_y_coord = y_coord + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7445 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7447 if (device_check_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7448 return OVER_NOTHING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7450 frm_left = FRAME_LEFT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7451 frm_right = FRAME_RIGHT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7452 frm_top = FRAME_TOP_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7453 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7454
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7455 /* Check if the mouse is outside of the text area actually used by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7456 redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7457 if (y_coord < frm_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7458 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7459 if (y_coord >= FRAME_TOP_BORDER_START (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7460 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7461 low_y_coord = FRAME_TOP_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7462 high_y_coord = frm_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7463 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7464 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7465 else if (y_coord >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7466 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7467 low_y_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7468 high_y_coord = FRAME_TOP_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7469 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7470 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7471 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7472 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7473 low_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7474 high_y_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7475 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7476 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7477 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7478 else if (y_coord >= frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7479 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7480 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7481 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7482 low_y_coord = frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7483 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7484 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7485 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7486 else if (y_coord < FRAME_PIXHEIGHT (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7487 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7488 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7489 high_y_coord = FRAME_PIXHEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7490 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7491 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7492 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7493 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7494 low_y_coord = FRAME_PIXHEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7495 high_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7496 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7497 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7498 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7499
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7500 if (position != OVER_TOOLBAR && position != OVER_BORDER)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7501 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7502 if (x_coord < frm_left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7503 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7504 if (x_coord >= FRAME_LEFT_BORDER_START (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7505 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7506 low_x_coord = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7507 high_x_coord = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7508 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7509 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7510 else if (x_coord >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7511 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7512 low_x_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7513 high_x_coord = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7514 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7515 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7516 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7517 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7518 low_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7519 high_x_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7520 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7521 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7522 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7523 else if (x_coord >= frm_right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7524 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7525 if (x_coord < FRAME_RIGHT_BORDER_END (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7526 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7527 low_x_coord = frm_right;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7528 high_x_coord = FRAME_RIGHT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7529 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7530 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7531 else if (x_coord < FRAME_PIXWIDTH (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7532 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7533 low_x_coord = FRAME_RIGHT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7534 high_x_coord = FRAME_PIXWIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7535 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7536 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7537 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7538 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7539 low_x_coord = FRAME_PIXWIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7540 high_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7541 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7542 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7543 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7544 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7546 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7547 if (position == OVER_TOOLBAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7548 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7549 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7550 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7551 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7552 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7553 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
7554 #endif /* HAVE_TOOLBARS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7556 /* We still have to return the window the pointer is next to and its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7557 relative y position even if it is outside the x boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7558 if (x_coord < frm_left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7559 x_coord = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7560 else if (x_coord > frm_right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7561 x_coord = frm_right;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7562
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7563 /* Same in reverse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7564 if (y_coord < frm_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7565 y_coord = frm_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7566 else if (y_coord > frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7567 y_coord = frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7568
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7569 /* Find what window the given coordinates are actually in. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7570 window = f->root_window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7571 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7573 /* If we didn't find a window, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7574 if (!*w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7575 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7576 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7577 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7578 else if (position != OVER_NOTHING)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7579 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7580 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7581 *modeline_closest = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7582
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7583 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7584 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7585 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7586 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7587 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7588 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7589
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7590 /* Check if the window is a minibuffer but isn't active. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7591 if (MINI_WINDOW_P (*w) && !minibuf_level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7592 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7593 /* Must reset the window value since some callers will ignore
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7594 the return value if it is set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7595 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7596 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7597 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7598
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7599 /* See if the point is over window vertical divider */
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7600 if (window_needs_vertical_divider (*w))
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7601 {
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7602 int div_x_high = WINDOW_RIGHT (*w);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7603 int div_x_low = div_x_high - window_divider_width (*w);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7604 int div_y_high = WINDOW_BOTTOM (*w);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7605 int div_y_low = WINDOW_TOP (*w);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7606
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7607 if (div_x_low < x_coord && x_coord <= div_x_high &&
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7608 div_y_low < y_coord && y_coord <= div_y_high)
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7609 {
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7610 low_x_coord = div_x_low;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7611 high_x_coord = div_x_high;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7612 low_y_coord = div_y_low;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7613 high_y_coord = div_y_high;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7614 position = OVER_V_DIVIDER;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7615 UPDATE_CACHE_RETURN;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7616 }
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7617 }
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7618
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7619 dla = window_display_lines (*w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7620
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7621 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7622 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7623 int really_over_nothing = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7624 struct display_line *dl = Dynarr_atp (dla, *row);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7625
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7626 if ((int) (dl->ypos - dl->ascent) <= y_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7627 && y_coord <= (int) (dl->ypos + dl->descent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7628 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7629 int check_margin_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7630 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7631 struct rune *rb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7632
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7633 if (x_coord < dl->bounds.left_white
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7634 || x_coord >= dl->bounds.right_white)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7635 check_margin_glyphs = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7636
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7637 low_y_coord = dl->ypos - dl->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7638 high_y_coord = dl->ypos + dl->descent + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7639
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7640 if (position == OVER_BORDER
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7641 || position == OVER_OUTSIDE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7642 || check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7643 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7644 int x_check, left_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7645
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7646 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7647 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7648 x_check = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7649 left_bound = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7650 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7651 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7652 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7653 x_check = high_x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7654 left_bound = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7655 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7656
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7657 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7658 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7659 if (x_check <= left_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7660 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7661 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7662 *modeline_closest = Dynarr_atp (db->runes, 0)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7663 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7664 *closest = Dynarr_atp (db->runes, 0)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7665 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7666 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7667 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7668 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7669 *modeline_closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7670 Dynarr_atp (db->runes,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7671 Dynarr_length (db->runes) - 1)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7672 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7673 *closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7674 Dynarr_atp (db->runes,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
7675 Dynarr_length (db->runes) - 1)->bufpos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7676 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7677
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7678 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7679 *modeline_closest += dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7680 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7681 *closest += dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7682 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7683 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7684 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7685 /* #### What should be here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7686 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7687 *modeline_closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7688 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7689 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7690 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7691
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7692 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7693 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7694 if (x_coord < dl->bounds.left_in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7695 || x_coord >= dl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7696 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7697 /* If we are over the outside margins then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7698 know the loop over the text block isn't going
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7699 to accomplish anything. So we go ahead and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7700 set what information we can right here and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7701 return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7702 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7703 *obj_y = y_coord - (dl->ypos - dl->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7704 get_position_object (dl, obj1, obj2, x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7705 &low_x_coord, &high_x_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7706
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7707 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7708 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7709 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7710 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7711 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7712 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7713
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7714 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7715 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7716 int past_end = (*col == Dynarr_length (db->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7717
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7718 if (!past_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7719 rb = Dynarr_atp (db->runes, *col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7720
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7721 if (past_end ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7722 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7723 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7724 if (past_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7725 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7726 (*col)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7727 rb = Dynarr_atp (db->runes, *col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7728 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7729
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7730 *bufpos = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7731 low_x_coord = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7732 high_x_coord = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7733
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7734 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7735 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7736 int elt = *col + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7737
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7738 /* Find the first character after the glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7739 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7740 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7741 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7742 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7743 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7744 *modeline_closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7745 (Dynarr_atp (db->runes, elt)->bufpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7746 dl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7747 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7748 *closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7749 (Dynarr_atp (db->runes, elt)->bufpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7750 dl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7751 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7752 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7753
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7754 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7755 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7757 /* In this case we failed to find a non-glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7758 character so we return the last position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7759 displayed on the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7760 if (elt == Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7761 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7762 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7763 *modeline_closest = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7764 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7765 *closest = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7766 really_over_nothing = 1;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
7767 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7768 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7769 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7770 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7771 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7772 *modeline_closest = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7773 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7774 *closest = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7775 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7776
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7777 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7778 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7779 *row = window_displayed_height (*w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7780
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7781 if (position == OVER_NOTHING)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7782 position = OVER_MODELINE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7783
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7784 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7785 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7786 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7787 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7788 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7789 else if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7790 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7791 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7792 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7793 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7794 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7795 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7796 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7797 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7798 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7799
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7800 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7801 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7802 else if (past_end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7803 || (rb->type == RUNE_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7804 && rb->object.chr.ch == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7805 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7806 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7807 /* At this point we may have glyphs in the right
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7808 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7809 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7810 get_position_object (dl, obj1, obj2, x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7811 &low_x_coord, &high_x_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7812 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7813 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7814 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7815 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7816 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7817 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7818 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7819 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7820 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7821 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7822 else if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7823 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7824 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7825 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7826 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7827 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7828 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7829 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7830 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7831 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7832
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7833 *obj_x = x_coord - rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7834 *obj_y = y_coord - (dl->ypos - dl->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7835
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7836 /* At this point we may have glyphs in the left
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7837 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7838 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7839 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7840
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7841 if (position == OVER_NOTHING && !really_over_nothing)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7842 position = OVER_TEXT;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7843
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7844 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7845 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7846 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7847 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7848 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7849 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7850
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7851 *row = Dynarr_length (dla) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7852 if (FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7853 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7854 int bot_elt = Dynarr_length (dla) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7856 if (bot_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7857 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7858 struct display_line *dl = Dynarr_atp (dla, bot_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7859 int adj_area = y_coord - (dl->ypos + dl->descent);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7860 Lisp_Object lwin;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7861 int defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7862
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7863 XSETWINDOW (lwin, *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7864 default_face_height_and_width (lwin, 0, &defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7865
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7866 *row += (adj_area / defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7867 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7868 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7869
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7870 /* #### This should be checked out some more to determine what
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7871 should really be going on. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7872 if (!MARKERP ((*w)->start[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7873 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7874 else
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7875 *closest = end_of_last_line (*w,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7876 marker_position ((*w)->start[CURRENT_DISP]));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7877 *col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7878 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7879 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7880 #undef UPDATE_CACHE_RETURN
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7881
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7882
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7883 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7884 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7885 /* Lisp functions */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7886 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7887 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7888
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7889 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7890 Ensure that all minibuffers are correctly showing the echo area.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7891 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7892 ())
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7893 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7894 Lisp_Object devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7895
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7896 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7897 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7898 struct device *d = XDEVICE (XCAR (devcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7899 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7900
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7901 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7902 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7903 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7904
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
7905 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7906 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7907 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
7908 /*
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7909 * If the frame size has changed, there may be random
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7910 * chud on the screen left from previous messages
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7911 * because redisplay_frame hasn't been called yet.
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7912 * Clear the screen to get rid of the potential mess.
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
7913 */
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7914 if (f->echo_area_garbaged)
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7915 {
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7916 DEVMETH (d, clear_frame, (f));
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7917 f->echo_area_garbaged = 0;
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7918 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7919 redisplay_window (window, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7920 call_redisplay_end_triggers (XWINDOW (window), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7921 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7922 }
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7923
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7924 /* We now call the output_end routine for tty frames. We delay
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7925 doing so in order to avoid cursor flicker. So much for 100%
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7926 encapsulation. */
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7927 if (DEVICE_TTY_P (d))
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
7928 DEVMETH (d, output_end, (d));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7929 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7930
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7931 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7932 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7933
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7934 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7935 restore_disable_preemption_value (Lisp_Object value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7936 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7937 disable_preemption = XINT (value);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7938 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7939 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7940
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7941 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7942 Clear frame FRAME and output again what is supposed to appear on it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7943 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7944 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7945 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7946 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7947 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7948 (frame, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7949 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7950 struct frame *f = decode_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7951 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7953 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7954 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7955 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7956 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7957 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7958 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7959
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7960 f->clear = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7961 redisplay_frame (f, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7962
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7963 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7964 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7965
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7966 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7967 Ensure that FRAME's contents are correctly displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7968 This differs from `redraw-frame' in that it only redraws what needs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7969 be updated, as opposed to unconditionally clearing and redrawing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7970 the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7971 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7972 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7973 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7974 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7975 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7976 (frame, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7977 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7978 struct frame *f = decode_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7979 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7980
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7981 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7982 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7983 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7984 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7985 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7986 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7988 redisplay_frame (f, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7990 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7991 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7992
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7993 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7994 Clear device DEVICE and output again what is supposed to appear on it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7995 DEVICE defaults to the selected device if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7996 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7997 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7998 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7999 */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
8000 (device, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8001 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8002 struct device *d = decode_device (device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8003 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8004 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8005
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8006 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8007 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8008 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8009 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8010 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8011 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8012
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8013 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8014 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8015 XFRAME (XCAR (frmcons))->clear = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8016 }
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8017 redisplay_device (d);
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
8018
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8019 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8020 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8021
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8022 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8023 Ensure that DEVICE's contents are correctly displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8024 This differs from `redraw-device' in that it only redraws what needs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8025 be updated, as opposed to unconditionally clearing and redrawing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8026 the device.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8027 DEVICE defaults to the selected device if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8028 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8029 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8030 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8031 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8032 (device, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8033 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8034 struct device *d = decode_device (device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8035 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8037 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8038 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8039 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8040 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8041 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8042 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8043
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8044 redisplay_device (d);
404
2f8bb876ab1d Import from CVS: tag r21-2-32
cvs
parents: 400
diff changeset
8045
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8046 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8047 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8049 /* Big lie. Big lie. This will force all modelines to be updated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8050 regardless if the all flag is set or not. It remains in existence
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8051 solely for backwards compatibility. */
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8052 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8053 Force the modeline of the current buffer to be redisplayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8054 With optional non-nil ALL, force redisplay of all modelines.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8055 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8056 (all))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8057 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8058 MARK_MODELINE_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8059 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8060 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8061
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8062 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8063 Force an immediate update of the cursor on FRAME.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8064 FRAME defaults to the selected frame if omitted.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8065 */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
8066 (frame))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8067 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8068 redisplay_redraw_cursor (decode_frame (frame), 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8069 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8070 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8073 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8074 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8075 /* Lisp-variable change triggers */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8076 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8077 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8078
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8079 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8080 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8081 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8082 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8083 /* Nothing to be done? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8084 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8085
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8086 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8087 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8088 Lisp_Object in_object, int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8089 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8090 /* #### clip_changed should really be renamed something like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8091 global_redisplay_change. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8092 MARK_CLIP_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8093 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8094 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8095
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8096 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8097 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8098 Lisp_Object locale)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8099 {
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8100 if (WINDOWP (locale))
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8101 {
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8102 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8103 }
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8104 else if (FRAMEP (locale))
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8105 {
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8106 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8107 }
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8108 else if (DEVICEP (locale))
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8109 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8110 Lisp_Object frmcons;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8111 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8112 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8113 }
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8114 else if (CONSOLEP (locale))
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8115 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8116 Lisp_Object frmcons, devcons;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8117 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8118 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8119 }
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8120 else /* global or buffer */
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8121 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8122 Lisp_Object frmcons, devcons, concons;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8123 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8124 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8125 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8126 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8127
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8128 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8129 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8130 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8131 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8132 if (XFRAME (w->frame)->init_finished)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8133 Fforce_cursor_redisplay (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8134 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8136 #ifdef MEMORY_USAGE_STATS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8137
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8139 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8140 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8141 /* memory usage computation */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8142 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8143 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8145 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8146 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8147 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8148 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8149 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8151 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8152 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8153 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8154 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8155 int total, i;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8156
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8157 if (!dyn)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8158 return 0;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8159
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8160 total = Dynarr_memory_usage (dyn, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8161 for (i = 0; i < Dynarr_largest (dyn); i++)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8162 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8163
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8164 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8165 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8167 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8168 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8169 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8170 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8171 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8172 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8174 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8175 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8176 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8177 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8178 int total, i;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8179
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8180 if (!dyn)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8181 return 0;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8182
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8183 total = Dynarr_memory_usage (dyn, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8184 for (i = 0; i < Dynarr_largest (dyn); i++)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8185 {
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8186 struct display_line *dl = &Dynarr_at (dyn, i);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8187 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8188 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8189 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8190 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8191
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8192 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8193 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8195 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8196 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8197 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8198 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8199 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8200 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8201
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8202 #endif /* MEMORY_USAGE_STATS */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8204
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8205 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8206 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8207 /* initialization */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8208 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8209 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8210
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8211 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8212 init_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8213 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8214 disable_preemption = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8215 preemption_count = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8216 max_preempts = INIT_MAX_PREEMPTS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8218 if (!initialized)
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8219 {
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8220 cmotion_display_lines = Dynarr_new (display_line);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8221 mode_spec_bufbyte_string = Dynarr_new (Bufbyte);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8222 formatted_string_emchar_dynarr = Dynarr_new (Emchar);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8223 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8224 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8225 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8226 internal_cache = Dynarr_new (line_start_cache);
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8227 xzero (formatted_string_display_line);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8228 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8230 /* window system is nil when in -batch mode */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8231 if (!initialized || noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8232 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8234 /* If the user wants to use a window system, we shouldn't bother
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8235 initializing the terminal. This is especially important when the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8236 terminal is so dumb that emacs gives up before and doesn't bother
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8237 using the window system.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8238
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8239 If the DISPLAY environment variable is set, try to use X, and die
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8240 with an error message if that doesn't work. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8242 #ifdef HAVE_X_WINDOWS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8243 if (!strcmp (display_use, "x"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8244 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8245 /* Some stuff checks this way early. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8246 Vwindow_system = Qx;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8247 Vinitial_window_system = Qx;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8248 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8249 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8250 #endif /* HAVE_X_WINDOWS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8251
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8252 #ifdef HAVE_MS_WINDOWS
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8253 if (!strcmp (display_use, "mswindows"))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8254 {
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8255 /* Some stuff checks this way early. */
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8256 Vwindow_system = Qmswindows;
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8257 Vinitial_window_system = Qmswindows;
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8258 return;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8259 }
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8260 #endif /* HAVE_MS_WINDOWS */
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8261
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8262 #ifdef HAVE_TTY
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8263 /* If no window system has been specified, try to use the terminal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8264 if (!isatty (0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8265 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8266 stderr_out ("XEmacs: standard input is not a tty\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8267 exit (1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8268 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8270 /* Look at the TERM variable */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8271 if (!getenv ("TERM"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8272 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8273 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8274 exit (1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8275 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8276
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8277 Vinitial_window_system = Qtty;
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8278 return;
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8279 #else /* not HAVE_TTY */
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8280 /* No DISPLAY specified, and no TTY support. */
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8281 stderr_out ("XEmacs: Cannot open display.\n\
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8282 Please set the environmental variable DISPLAY to an appropriate value.\n");
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8283 exit (1);
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8284 #endif
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8285 /* Unreached. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8286 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8288 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8289 syms_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8290 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8291 defsymbol (&Qcursor_in_echo_area, "cursor-in-echo-area");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8292 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8293 defsymbol (&Qpre_redisplay_hook, "pre-redisplay-hook");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8294 defsymbol (&Qpost_redisplay_hook, "post-redisplay-hook");
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8295 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8296 defsymbol (&Qdisplay_warning_buffer, "display-warning-buffer");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8297 defsymbol (&Qbar_cursor, "bar-cursor");
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8298 defsymbol (&Qwindow_scroll_functions, "window-scroll-functions");
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8299 defsymbol (&Qredisplay_end_trigger_functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8300 "redisplay-end-trigger-functions");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8301
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8302 DEFSUBR (Fredisplay_echo_area);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8303 DEFSUBR (Fredraw_frame);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8304 DEFSUBR (Fredisplay_frame);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8305 DEFSUBR (Fredraw_device);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8306 DEFSUBR (Fredisplay_device);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8307 DEFSUBR (Fredraw_modeline);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8308 DEFSUBR (Fforce_cursor_redisplay);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8309 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8310
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8311 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8312 vars_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8313 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8314 #if 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8315 staticpro (&last_arrow_position);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8316 staticpro (&last_arrow_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8317 last_arrow_position = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8318 last_arrow_string = Qnil;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8319 #endif /* 0 */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8320
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8321 updating_line_start_cache = 0;
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8322
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8323 /* #### Probably temporary */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8324 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
8325 \(Temporary) Setting this will impact the performance of the internal
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8326 line start cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8327 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8328 cache_adjustment = 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8330 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8331 Minimum pixel height for clipped bottom display line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8332 A clipped line shorter than this won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8333 */ ,
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8334 redisplay_variable_changed);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8335 vertical_clip = 5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8337 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8338 Minimum visible area for clipped glyphs at right boundary.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8339 Clipped glyphs shorter than this won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8340 Only pixmap glyph instances are currently allowed to be clipped.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8341 */ ,
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8342 redisplay_variable_changed);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8343 horizontal_clip = 5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8344
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8345 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
8346 String displayed by modeline-format's "%m" specification.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8347 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8348 Vglobal_mode_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8350 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8351 Marker for where to display an arrow on top of the buffer text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8352 This must be the beginning of a line in order to work.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8353 See also `overlay-arrow-string'.
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8354 */ ,
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8355 redisplay_variable_changed);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8356 Voverlay_arrow_position = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8358 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8359 String to display as an arrow. See also `overlay-arrow-position'.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8360 */ ,
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8361 redisplay_variable_changed);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8362 Voverlay_arrow_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8363
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8364 DEFVAR_INT ("scroll-step", &scroll_step /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8365 *The number of lines to try scrolling a window by when point moves out.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8366 If that fails to bring point back on frame, point is centered instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8367 If this is zero, point is always centered after it moves off screen.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8368 */ );
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8369 scroll_step = 0;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8370
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8371 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8372 *Scroll up to this many lines, to bring point back on screen.
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8373 */ );
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8374 scroll_conservatively = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8376 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8377 &truncate_partial_width_windows /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8378 *Non-nil means truncate lines in all windows less than full frame wide.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8379 */ ,
380
8626e4521993 Import from CVS: tag r21-2-5
cvs
parents: 373
diff changeset
8380 redisplay_variable_changed);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8381 truncate_partial_width_windows = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8382
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8383 DEFVAR_BOOL ("visible-bell", &visible_bell /*
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8384 *Non-nil means try to flash the frame to represent a bell.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8385 */ );
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8386 visible_bell = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8387
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8388 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8389 *Non-nil means no need to redraw entire frame after suspending.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8390 A non-nil value is useful if the terminal can automatically preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8391 Emacs's frame display when you reenter Emacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8392 It is up to you to set this variable if your terminal can do that.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8393 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8394 no_redraw_on_reenter = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8395
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8396 DEFVAR_LISP ("window-system", &Vwindow_system /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8397 A symbol naming the window-system under which Emacs is running,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8398 such as `x', or nil if emacs is running on an ordinary terminal.
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8399
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8400 Do not use this variable, except for GNU Emacs compatibility, as it
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8401 gives wrong values in a multi-device environment. Use `console-type'
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8402 instead.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8403 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8404 Vwindow_system = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8406 /* #### Temporary shit until window-system is eliminated. */
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8407 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8408 DON'T TOUCH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8409 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8410 Vinitial_window_system = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8412 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8413 Non-nil means put cursor in minibuffer, at end of any message there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8414 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8415 cursor_in_echo_area = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8416
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8417 /* #### Shouldn't this be generalized as follows:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8419 if nil, use block cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8420 if a number, use a bar cursor of that width.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8421 Otherwise, use a 1-pixel bar cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8423 #### Or better yet, this variable should be trashed entirely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8424 (use a Lisp-magic variable to maintain compatibility)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8425 and a specifier `cursor-shape' added, which allows a block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8426 cursor, a bar cursor, a flashing block or bar cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8427 maybe a caret cursor, etc. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8428
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8429 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8430 Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8431 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8432 Vbar_cursor = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8433
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8434 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8435 xxDEFVAR_LISP ("pre-redisplay-hook", &Vpre_redisplay_hook /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8436 Function or functions to run before every redisplay.
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8437 Functions on this hook must be careful to avoid signalling errors!
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8438 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8439 Vpre_redisplay_hook = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8441 xxDEFVAR_LISP ("post-redisplay-hook", &Vpost_redisplay_hook /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8442 Function or functions to run after every redisplay.
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8443 Functions on this hook must be careful to avoid signalling errors!
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8444 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8445 Vpost_redisplay_hook = Qnil;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8446 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8448 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8449 Bump this to tell the C code to call `display-warning-buffer'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8450 at next redisplay. You should not normally change this; the function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8451 `display-warning' automatically does this at appropriate times.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8452 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8453 display_warning_tick = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8454
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8455 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8456 Non-nil means inhibit display of warning messages.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8457 You should *bind* this, not set it. Any pending warning messages
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8458 will be displayed when the binding no longer applies.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8459 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8460 /* reset to 0 by startup.el after the splash screen has displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8461 This way, the warnings don't obliterate the splash screen. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8462 inhibit_warning_display = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8463
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8464 DEFVAR_LISP ("window-size-change-functions",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8465 &Vwindow_size_change_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8466 Not currently implemented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8467 Functions called before redisplay, if window sizes have changed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8468 The value should be a list of functions that take one argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8469 Just before redisplay, for each frame, if any of its windows have changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8470 size since the last redisplay, or have been split or deleted,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8471 all the functions in the list are called, with the frame as argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8472 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8473 Vwindow_size_change_functions = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8475 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8476 Not currently implemented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8477 Functions to call before redisplaying a window with scrolling.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8478 Each function is called with two arguments, the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8479 and its new display-start position. Note that the value of `window-end'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8480 is not valid when these functions are called.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8481 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8482 Vwindow_scroll_functions = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8483
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8484 DEFVAR_LISP ("redisplay-end-trigger-functions",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8485 &Vredisplay_end_trigger_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8486 See `set-window-redisplay-end-trigger'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8487 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8488 Vredisplay_end_trigger_functions = Qnil;
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8489
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8490 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
142
1856695b1fa9 Import from CVS: tag r20-2b5
cvs
parents: 120
diff changeset
8491 *Non-nil means column display number starts at 1.
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8492 */ );
294
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 284
diff changeset
8493 column_number_start_at_one = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8494 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8495
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8496 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8497 specifier_vars_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8498 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8499 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8500 *Width of left margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8501 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8502 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8503 Vleft_margin_width = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8504 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8505 set_specifier_caching (Vleft_margin_width,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8506 slot_offset (struct window, left_margin_width),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8507 some_window_value_changed,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8508 slot_offset (struct frame, left_margin_width),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8509 margin_width_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8510
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8511 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8512 *Width of right margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8513 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8514 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8515 Vright_margin_width = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8516 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8517 set_specifier_caching (Vright_margin_width,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8518 slot_offset (struct window, right_margin_width),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8519 some_window_value_changed,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8520 slot_offset (struct frame, right_margin_width),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8521 margin_width_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8523 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8524 *Minimum ascent height of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8525 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8526 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8527 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8528 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8529 set_specifier_caching (Vminimum_line_ascent,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8530 slot_offset (struct window, minimum_line_ascent),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8531 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8532 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8534 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8535 *Minimum descent height of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8536 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8537 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8538 Vminimum_line_descent = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8539 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8540 set_specifier_caching (Vminimum_line_descent,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8541 slot_offset (struct window, minimum_line_descent),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8542 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8543 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8544
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8545 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8546 *Non-nil means use the left outside margin as extra whitespace when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8547 displaying 'whitespace or 'inside-margin glyphs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8548 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8549 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8550 Vuse_left_overflow = Fmake_specifier (Qboolean);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8551 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8552 set_specifier_caching (Vuse_left_overflow,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8553 slot_offset (struct window, use_left_overflow),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8554 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8555 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8557 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8558 *Non-nil means use the right outside margin as extra whitespace when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8559 displaying 'whitespace or 'inside-margin glyphs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8560 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8561 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8562 Vuse_right_overflow = Fmake_specifier (Qboolean);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8563 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8564 set_specifier_caching (Vuse_right_overflow,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8565 slot_offset (struct window, use_right_overflow),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8566 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8567 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8568
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8569 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8570 *Non-nil means the text cursor is visible (this is usually the case).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8571 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8572 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8573 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8574 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8575 set_specifier_caching (Vtext_cursor_visible_p,
412
697ef44129c6 Import from CVS: tag r21-2-14
cvs
parents: 410
diff changeset
8576 slot_offset (struct window, text_cursor_visible_p),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8577 text_cursor_visible_p_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8578 0, 0);
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8579
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8580 }