annotate src/redisplay.c @ 361:7347b34c275b r21-1-10

Import from CVS: tag r21-1-10
author cvs
date Mon, 13 Aug 2007 10:58:40 +0200
parents 8bec6624d99b
children a4f53d9b3154
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"
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
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"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 #include "extents.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 #include "faces.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 #include "frame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 #include "glyphs.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 #include "insdel.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 #include "menubar.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 #include "objects.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 #include "process.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 #include "redisplay.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 #include "toolbar.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 #include "window.h"
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
60 #include "line-number.h"
259
11cf20601dec Import from CVS: tag r20-5b28
cvs
parents: 257
diff changeset
61 #ifdef FILE_CODING
11cf20601dec Import from CVS: tag r20-5b28
cvs
parents: 257
diff changeset
62 #include "file-coding.h"
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
63 #endif
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
64
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
65 #ifdef HAVE_TTY
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
66 #include "console-tty.h"
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
67 #ifdef HAVE_UNISTD_H
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
68 #include <unistd.h> /* for isatty() */
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
69 #endif
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
70 #endif /* HAVE_TTY */
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
71
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 /* Note: We have to be careful throughout this code to properly handle
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 and differentiate between Bufbytes and Emchars.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 Since strings are generally composed of Bufbytes, I've taken the tack
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 that any contiguous set of Bufbytes is called a "string", while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 any contiguous set of Emchars is called an "array". */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 /* Return value to indicate a failure by an add_*_rune routine to add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 a rune, but no propagation information needs to be returned. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 #define ADD_FAILED (prop_block_dynarr *) 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 #define BEGIN_GLYPHS 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 #define END_GLYPHS 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 #define LEFT_GLYPHS 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 #define RIGHT_GLYPHS 3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 /* Set the vertical clip to 0 if we are currently updating the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 start cache. Otherwise for buffers of line height 1 it may fail to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 be able to work properly because regenerate_window will not layout
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 a single line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 #define VERTICAL_CLIP(w, display) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 (updating_line_start_cache \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 ? 0 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 : ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 ? INT_MAX \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 : vertical_clip))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 /* The following structures are completely private to redisplay.c so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 we put them here instead of in a header file, for modularity. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 /* NOTE: Bytinds not Bufpos's in this structure. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 typedef struct position_redisplay_data_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 /* This information is normally filled in by the create_*_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 routines and is used by the add_*_rune routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 Emchar ch; /* Character that is to be added. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 used to communicate this information to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 add_emchar_rune(). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 Lisp_Object last_charset; /* The charset of the previous character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 Used to optimize some lookups -- we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 only have to do some things when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 the charset changes. */
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
119 face_index last_findex; /* The face index of the previous character.
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
120 Needed to ensure the validity of the
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
121 last_charset optimization. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
122
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 int last_char_width; /* The width of the previous character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 int font_is_bogus; /* If true, it means we couldn't instantiate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 the font for this charset, so we substitute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 ~'s from the ASCII charset. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 Bytind bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 Bytind bi_endpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 int pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 int max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 int blank_width; /* Width of the blank that is to be added.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 This is used to communicate this information
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 to add_blank_rune().
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 This is also used rather cheesily to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 communicate the width of the eol-cursor-size
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 blank that exists at the end of the line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 add_emchar_rune() is called cheesily with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 the non-printing char '\n', which is stuck
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 in the output routines with its width being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 BLANK_WIDTH. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 Bytind bi_cursor_bufpos;/* This stores the buffer position of the cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 unsigned int cursor_type :3;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 int cursor_x; /* rune block cursor is at */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 int start_col; /* Number of character columns (each column has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 a width of the default char width) that still
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 need to be skipped. This is used for horizontal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 scrolling, where a certain number of columns
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 (those off the left side of the screen) need
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 to be skipped before anything is displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 Bytind bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
153 int hscroll_glyph_width_adjust; /* how much the width of the hscroll
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
154 glyph differs from space_width (w).
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
155 0 if no hscroll glyph was used,
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
156 i.e. the window is not scrolled
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
157 horizontally. Used in tab
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
158 calculations. */
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
159
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 /* Information about the face the text should be displayed in and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 any begin-glyphs and end-glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 struct extent_fragment *ef;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 face_index findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 /* 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
166 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
167 line ascent and descent values end up being, based just on font
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 information. In the first case we can immediately update the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 values, thus their inclusion here. In the last case we cannot
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 determine the actual contribution to the line height until we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 have finished laying out all text on the line. Thus we propagate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 the max height of such pixmaps and do a final calculation after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 all text has been added to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 int new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 int new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 int max_pixmap_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 Lisp_Object result_str; /* String where we put the result of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 generating a formatted string in the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 int is_modeline; /* Non-zero if we're generating the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 Charcount modeline_charpos; /* Number of chars used in result_str so far;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 corresponds to bytepos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 Bytecount bytepos; /* Number of bytes used in result_str so far.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 We don't actually copy the bytes into result_str
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 until the end because we don't know how big the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 string is going to be until then. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 } pos_data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 enum prop_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 PROP_STRING,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 PROP_CHAR,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 PROP_MINIBUF_PROMPT,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 PROP_BLANK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 /* Data that should be propagated to the next line. Either a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 Emchar or a string of Bufbyte's.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 The actual data that is propagated ends up as a Dynarr of these
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 blocks.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 #### It's unclean that both Emchars and Bufbytes are here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
206 typedef struct prop_block prop_block;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 struct prop_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 enum prop_type type;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
210
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 union data
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
212 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
213 struct
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
214 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
215 Bufbyte *str;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
216 Bytecount len; /* length of the string. */
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
217 } p_string;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
218
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
219 struct
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
220 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
221 Emchar ch;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
222 Bytind bi_cursor_bufpos; /* NOTE: is in Bytinds */
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
223 unsigned int cursor_type :3;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
224 } p_char;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
225
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
226 struct
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
227 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
228 int width;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
229 face_index findex;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
230 } p_blank;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
231 } data;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
234 typedef struct
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
236 Dynarr_declare (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 } prop_block_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 static void generate_formatted_string_db (Lisp_Object format_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 Lisp_Object result_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 face_index findex, int min_pixpos,
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
246 int max_pixpos, int type);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 Charcount pos, Charcount min_pos,
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
249 Charcount max_pos, Lisp_Object elt,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 int depth, int max_pixsize,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 face_index findex, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 static prop_block_dynarr *add_glyph_rune (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 struct glyph_block *gb,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 int pos_type, int allow_cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 struct glyph_cachel *cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 static Bytind create_text_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 Bytind bi_start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 prop_block_dynarr **prop, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 static int create_overlay_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 static void create_left_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 int overlay_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 static void create_right_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 static void redisplay_windows (Lisp_Object window, int skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 static void decode_mode_spec (struct window *w, Emchar spec, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 static void free_display_line (struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 static void update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 Bufpos point, int no_regen);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
271 static int point_visible (struct window *w, Bufpos point, int type);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 /* This used to be 10 but 30 seems to give much better performance. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 #define INIT_MAX_PREEMPTS 30
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 static int max_preempts;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
277 #define REDISPLAY_PREEMPTION_CHECK \
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
278 ((void) \
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
279 (preempted = \
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
280 (!disable_preemption && \
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
281 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
282 (!INTERACTIVE || detect_input_pending ()))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 * Redisplay global variables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 /* We need a third set of display structures for the cursor motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 routines. We used to just give each window a third set. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 we always fully regenerate the structures when needed so there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 isn't any reason we need more than a single set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 display_line_dynarr *cmotion_display_lines;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 /* Used by generate_formatted_string. Global because they get used so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 much that the dynamic allocation time adds up. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
296 Emchar_dynarr *formatted_string_emchar_dynarr;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 struct display_line formatted_string_display_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 /* 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
299 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
300 this way rather than adding them as we generate the string because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 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
302 (to avoid having to resize the string multiple times), and we don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 want to go around adding extents to a string when the extents might
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 stretch off the end of the string. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
305 EXTENT_dynarr *formatted_string_extent_dynarr;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
306 Bytecount_dynarr *formatted_string_extent_start_dynarr;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
307 Bytecount_dynarr *formatted_string_extent_end_dynarr;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 /* #### probably temporary */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 int cache_adjustment;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 /* This holds a string representing the text corresponding to a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 modeline % spec. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
315 static Bufbyte_dynarr *mode_spec_bufbyte_string;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 int in_display; /* 1 if in redisplay. */
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 disable_preemption; /* Used for debugging redisplay and for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 force-redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 /* We only allow max_preempts preemptions before we force a redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 static int preemption_count;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 /* Minimum pixel height of clipped bottom display line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 int vertical_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 /* Minimum visible pixel width of clipped glyphs at right margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 int horizontal_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 /* Set if currently inside update_line_start_cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 int updating_line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 /* Nonzero means reading single-character input with prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 so put cursor on minibuffer after the prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 int cursor_in_echo_area;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 Lisp_Object Qcursor_in_echo_area;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 /* Nonzero means truncate lines in all windows less wide than the frame */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 int truncate_partial_width_windows;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 /* non-nil if a buffer has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 int buffers_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 int buffers_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 /* non-nil if hscroll has changed somewhere or a buffer has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 narrowed or widened */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 int clip_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 int clip_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 /* non-nil if any extent has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 int extents_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 int extents_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 /* non-nil if any face has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 int faces_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 /* Nonzero means some frames have been marked as garbaged */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 int frame_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
361 /* non-zero if any of the builtin display glyphs (continuation,
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
362 hscroll, control-arrow, etc) is in need of updating
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
363 somewhere. */
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
364 int glyphs_changed;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
365 int glyphs_changed_set;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
366
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
367 /* This variable is 1 if the icon has to be updated.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 It is set to 1 when `frame-icon-glyph' changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 int icon_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 int icon_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
372 /* This variable is 1 if the menubar widget has to be updated.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 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
374 has been updated. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 int menubar_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 int menubar_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 /* true iff we should redraw the modelines on the next redisplay */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 int modeline_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 int modeline_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 /* non-nil if point has changed in some buffer since the last time
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 int point_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 int point_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 /* non-nil if some frame has changed its size */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 int size_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 /* non-nil if some device has signaled that it wants to change size */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 int asynch_device_change_pending;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 /* non-nil if any toolbar has changed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 int toolbar_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 int toolbar_changed_set;
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 any window has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 int windows_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
400 /* 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
401 time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 int windows_structure_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 /* If non-nil, use vertical bar cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 Lisp_Object Vbar_cursor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 Lisp_Object Qbar_cursor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 int visible_bell; /* If true and the terminal will support it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 then the frame will flash instead of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 beeping when an error occurs */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 /* Nonzero means no need to redraw the entire frame on resuming
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 a suspended Emacs. This is useful on terminals with multiple pages,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 where one page is used for Emacs and another for all else. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 int no_redraw_on_reenter;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 under which emacs is running
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 ('x is the only current possibility) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 Lisp_Object Vinitial_window_system;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 Lisp_Object Vglobal_mode_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
425 /* 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
426 it is <=0 then point is centered in the window */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 int scroll_step;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
429 /* Scroll up to this many lines, to bring point back on screen. */
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
430 int scroll_conservatively;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
431
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 /* Marker for where to display an arrow on top of the buffer text. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 Lisp_Object Voverlay_arrow_position;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 /* String to display for the arrow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 Lisp_Object Voverlay_arrow_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 Lisp_Object Vwindow_size_change_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 #define INHIBIT_REDISPLAY_HOOKS /* #### Until we've thought about
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 this more. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 /* #### Chuck says: I think this needs more thought.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 Think about this for 19.14. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
448 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 int last_display_warning_tick, display_warning_tick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 Lisp_Object Qdisplay_warning_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 int inhibit_warning_display;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 Lisp_Object Vleft_margin_width, Vright_margin_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 Lisp_Object Vtext_cursor_visible_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
459 int column_number_start_at_one;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 /* low-level interfaces onto device routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 redisplay_text_width_emchar_string (struct window *w, int findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 Emchar *str, Charcount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 unsigned char charsets[NUM_LEADING_BYTES];
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
472 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 find_charsets_in_emchar_string (charsets, str, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 charsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 249
diff changeset
479 text_width, (XFRAME (WINDOW_FRAME (w)),
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 249
diff changeset
480 WINDOW_FACE_CACHEL (w, findex), str, len));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
483 static Emchar_dynarr *rtw_emchar_dynarr;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 redisplay_text_width_string (struct window *w, int findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 Bytecount offset, Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 if (!rtw_emchar_dynarr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 rtw_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 Dynarr_reset (rtw_emchar_dynarr);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
493
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 fixup_internal_substring (nonreloc, reloc, offset, &len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 if (STRINGP (reloc))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
496 nonreloc = XSTRING_DATA (reloc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 return redisplay_text_width_emchar_string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 (w, findex, Dynarr_atp (rtw_emchar_dynarr, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 Dynarr_length (rtw_emchar_dynarr));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 Bytecount offset, Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 unsigned char charsets[NUM_LEADING_BYTES];
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
509 Lisp_Object frame;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 struct face_cachel cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 if (!rtw_emchar_dynarr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 rtw_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 Dynarr_reset (rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 fixup_internal_substring (nonreloc, reloc, offset, &len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 if (STRINGP (reloc))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
518 nonreloc = XSTRING_DATA (reloc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 find_charsets_in_bufbyte_string (charsets, nonreloc, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 reset_face_cachel (&cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 cachel.face = face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 XSETFRAME (frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 ensure_face_cachel_complete (&cachel, frame, charsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 249
diff changeset
526 text_width, (f, &cachel, Dynarr_atp (rtw_emchar_dynarr, 0),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 Dynarr_length (rtw_emchar_dynarr)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 /* Return the display block from DL of the given TYPE. A display line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 can have only one display block of each possible type. If DL does
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 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
533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 struct display_block *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 get_display_block_from_line (struct display_line *dl, enum display_type type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 struct display_block db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 /* 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
541 if so, return it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 if (Dynarr_at (dl->display_blocks, elt).type == type)
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
547 return Dynarr_atp (dl->display_blocks, elt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 /* There isn't an active block of the desired type, but there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 might still be allocated blocks we need to reuse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 if (elt < Dynarr_largest (dl->display_blocks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 /* 'add' the block to the list */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 Dynarr_increment (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 /* initialize and return */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 dbp->type = type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 return dbp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 /* This line doesn't have any display blocks, so initialize the display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 bock array. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
568 dl->display_blocks = Dynarr_new (display_block);
0
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 /* 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
572 one and add it to the line. */
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
573 xzero (db);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 db.type = type;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
575 db.runes = Dynarr_new (rune);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 Dynarr_add (dl->display_blocks, db);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 /* Return the newly added display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 elt = Dynarr_length (dl->display_blocks) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 return Dynarr_atp (dl->display_blocks, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 tab_char_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 int char_tab_width = XINT (b->tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 return char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 space_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 /* While tabs are traditional composed of spaces, for variable-width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 fonts the space character tends to give too narrow a value. So
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 we use 'n' instead. Except that we don't. We use the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 character width for the default face. If this is actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 defined by the font then it is probably the best thing to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 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
604 already calculated its width. Thus we can avoid a call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 XTextWidth on X frames by just querying the default width. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 return XFONT_INSTANCE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 tab_pix_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
613 return space_width (w) * tab_char_width (w);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 /* Given a pixel position in a window, return the pixel location of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 the next tabstop. Tabs are calculated from the left window edge in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 terms of spaces displayed in the default face. Formerly the space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 width was determined using the currently active face. That method
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 leads to tabstops which do not line up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 int n_pos = left_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 int pix_tab_width = tab_pix_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 /* Adjust n_pos for any hscrolling which has happened. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 if (w->hscroll > 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 n_pos -= space_width (w) * (w->hscroll - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 while (n_pos <= start_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 n_pos += pix_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 return n_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 /* For the given window, calculate the outside and margin boundaries for a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 display line. The whitespace boundaries must be calculated by the text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 layout routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 layout_bounds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 calculate_display_line_boundaries (struct window *w, int modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 layout_bounds bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 /* Set the outermost boundaries which are the boundaries of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 window itself minus the gutters (and minus the scrollbars if this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 is for the modeline). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 if (!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 bounds.left_out = WINDOW_TEXT_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 bounds.right_out = WINDOW_TEXT_RIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 bounds.left_out = WINDOW_MODELINE_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 /* The inner boundaries mark where the glyph margins are located. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 bounds.left_in = bounds.left_out + window_left_margin_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 bounds.right_in = bounds.right_out - window_right_margin_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 /* We cannot fully calculate the whitespace boundaries as they
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 depend on the contents of the line being displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 bounds.left_white = bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 bounds.right_white = bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 return bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 /* Given a display line and a starting position, ensure that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 contents of the display line accurately represent the visual
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 representation of the buffer contents starting from the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 position when displayed in the given window. The display line ends
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 when the contents of the line reach the right boundary of the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 generate_display_line (struct window *w, struct display_line *dl, int bounds,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 Bufpos start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 prop_block_dynarr **prop, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 Bufpos ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 int overlay_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 /* If our caller hasn't already set the boundaries, then do so now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 if (!bounds)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 dl->bounds = calculate_display_line_boundaries (w, 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 /* Reset what this line is using. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 Dynarr_reset (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 if (dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 Dynarr_free (dl->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 dl->left_glyphs = 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 if (dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 Dynarr_free (dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 dl->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 /* We aren't generating a modeline at the moment. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 dl->modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 /* Create a display block for the text region of the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 /* #### urk urk urk!!! Chuck fix this shit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 Bytind hacked_up_bytind =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 create_text_block (w, dl, bufpos_to_bytind (b, start_pos),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 start_col, prop, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 if (hacked_up_bytind > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 ret_bufpos = BUF_ZV (b) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 ret_bufpos = bytind_to_bufpos (b, hacked_up_bytind);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 dl->bufpos = start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 if (dl->end_bufpos < dl->bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 dl->end_bufpos = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 if (MARKERP (Voverlay_arrow_position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 && start_pos == marker_position (Voverlay_arrow_position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728 && (STRINGP (Voverlay_arrow_string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 || GLYPHP (Voverlay_arrow_string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 overlay_width = create_overlay_glyph_block (w, dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 overlay_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 /* If there are left glyphs associated with any character in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 text block, then create a display block to handle them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 create_left_glyph_block (w, dl, overlay_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 /* If there are right glyphs associated with any character in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 text block, then create a display block to handle them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 create_right_glyph_block (w, dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 /* In the future additional types of display blocks may be generated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 w->last_redisplay_pos = ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 return ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 /* Adds an hscroll glyph to a display block. If this is called, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 the block had better be empty.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 Yes, there are multiple places where this function is called but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 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
759 with bi_start_col_enabled a little differently depending on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 object being worked with. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 add_hscroll_rune (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 Bytind bi_old_bufpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 if (data->cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 && data->bi_cursor_bufpos >= data->bi_start_col_enabled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 && data->bi_cursor_bufpos <= data->bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 data->bi_cursor_bufpos = data->bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 data->bi_endpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 data->bi_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 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 gb.glyph = Vhscroll_glyph;
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
787 {
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
788 int oldpixpos = data->pixpos;
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
789 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
790 GLYPH_CACHEL (XWINDOW (data->window),
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
791 HSCROLL_GLYPH_INDEX));
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
792 data->hscroll_glyph_width_adjust =
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
793 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
794 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 data->bi_endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 data->bi_bufpos = bi_old_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 data->bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 /* Adds a character rune to a display block. If there is not enough
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 room to fit the rune on the display block (as determined by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 MAX_PIXPOS) then it adds nothing and returns ADD_FAILED. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 add_emchar_rune (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 struct rune rb, *crb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 int width, local;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 }
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->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 return add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 if (data->ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 data->font_is_bogus = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 /* Cheesy end-of-line pseudo-character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 Lisp_Object charset = CHAR_CHARSET (data->ch);
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
836 if (!EQ (charset, data->last_charset) ||
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
837 data->findex != data->last_findex)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 /* OK, we need to do things the hard way. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 struct window *w = XWINDOW (data->window);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
841 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 Lisp_Object font_instance =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 ensure_face_cachel_contains_charset (cachel, data->window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 charset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 struct Lisp_Font_Instance *fi;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 if (EQ (font_instance, Vthe_null_font_instance))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 data->font_is_bogus = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 data->font_is_bogus = 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 fi = XFONT_INSTANCE (font_instance);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 if (!fi->proportional_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 /* sweetness and light. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 data->last_char_width = fi->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 data->last_char_width = -1;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
861 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 data->new_descent = max (data->new_descent, (int) fi->descent);
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
863 data->last_charset = charset;
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
864 data->last_findex = data->findex;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 width = data->last_char_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 if (width < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 /* bummer. Proportional fonts. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 width = redisplay_text_width_emchar_string (XWINDOW (data->window),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 data->findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 &data->ch, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 local = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 crb = &rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 local = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 crb->findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 crb->xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 crb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 if (data->bi_bufpos)
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
897 crb->bufpos =
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
898 bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
899 data->bi_bufpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 else if (data->is_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 crb->bufpos = data->modeline_charpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 /* fuckme if this shouldn't be an abort. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 /* abort (); fuckme harder, this abort gets tripped quite often,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 in propagation and whatnot. #### fixme */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 crb->bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 crb->type = RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 crb->endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 crb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 crb->cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 else if (data->cursor_type == NEXT_CURSOR)
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 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 else if (data->cursor_type == IGNORE_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 crb->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 crb->cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 if (local)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 Dynarr_add (data->db->runes, *crb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 Dynarr_increment (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 data->pixpos += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 /* Given a string C_STRING of length C_LENGTH, call add_emchar_rune
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 for each character in the string. Propagate any left-over data
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 unless NO_PROP is non-zero. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 add_bufbyte_string_runes (pos_data *data, Bufbyte *c_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 Bytecount c_length, int no_prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 Bufbyte *pos, *end = c_string + c_length;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 /* #### This function is too simplistic. It needs to do the same
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 sort of character interpretation (display-table lookup,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 ctl-arrow checking), etc. that create_text_block() does.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 The functionality to do this in that routine needs to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 modularized. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
958
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 for (pos = c_string; pos < end;)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 data->ch = charptr_emchar (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 if (no_prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 Bytecount len = end - pos;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
973 prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 pb.type = PROP_STRING;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
976 pb.data.p_string.str = xnew_array (Bufbyte, len);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 pb.data.p_string.len = len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 INC_CHARPTR (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 assert (pos <= end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 /* Add a single rune of the specified width. The area covered by this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 rune will be displayed in the foreground color of the associated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 /* 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
1001 been to add it as a tab. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 /* assert (w != NULL) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 /* If we have still not fully scrolled horizontally, subtract
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 the width of this tab and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 if (char_tab_width < data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 data->start_col -= char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 else if (char_tab_width == data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 data->blank_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 int spcwid = space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 if (spcwid >= data->blank_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 data->blank_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 data->blank_width -= spcwid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
1025
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 data->start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 /* Could be caused by the handling of the hscroll rune. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 if (retval != NULL || !data->blank_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 /* Blank runes are always calculated to fit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 assert (data->pixpos + data->blank_width <= data->max_pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 rb.findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 rb.xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039 rb.width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 if (data->bi_bufpos)
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1041 rb.bufpos =
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1042 bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1043 data->bi_bufpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 /* #### and this is really correct too? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 rb.bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 rb.type = RUNE_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 else if (data->cursor_type == NEXT_CURSOR)
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 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 Dynarr_add (data->db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 data->pixpos += data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 /* Add runes representing a character in octal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 if (add_failed || (add_failed = add_emchar_rune (data))) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 struct prop_block pb; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 if (!prop) \
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1083 prop = Dynarr_new (prop_block); \
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 pb.type = PROP_CHAR; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 pb.data.p_char.ch = data->ch; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 pb.data.p_char.cursor_type = data->cursor_type; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 Dynarr_add (prop, pb); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 add_octal_runes (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 prop_block_dynarr *prop, *add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 Emchar orig_char = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 unsigned int orig_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 /* Initialize */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 add_failed = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 if (!data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 add_failed = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 gb.glyph = Voctal_escape_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 add_failed =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 /* We only propagate information if the glyph was partially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 added. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 return add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 if (data->ch >= 0x100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 /* If the character is an extended Mule character, it could have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 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
1136 octal number. This is not that pretty, but whatever. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 data->ch = (7 & (orig_char >> 18)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 data->ch = (7 & (orig_char >> 15)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 data->ch = (7 & (orig_char >> 12)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 data->ch = (7 & (orig_char >> 9)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 data->ch = (7 & (orig_char >> 6)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 data->ch = (7 & (orig_char >> 3)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 data->ch = (7 & orig_char) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 data->cursor_type = orig_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 #undef ADD_NEXT_OCTAL_RUNE_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 /* Add runes representing a control character to a display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 add_control_char_runes (pos_data *data, struct buffer *b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 if (!NILP (b->ctl_arrow))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 Emchar orig_char = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 /* Initialize */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 if (!data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189 if (retval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 gb.glyph = Vcontrol_arrow_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 /* We only propagate information if the glyph was partially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 added. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 if (orig_char == 0177)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 data->ch = '?';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 data->ch = orig_char ^ 0100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 if (add_emchar_rune (data))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 if (!prop)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1218 prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 pb.type = PROP_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 pb.data.p_char.ch = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 pb.data.p_char.cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 return add_octal_runes (data);
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 static prop_block_dynarr *
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1236 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1240 if (STRINGP (entry))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 prop = add_bufbyte_string_runes (data,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1243 XSTRING_DATA (entry),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1244 XSTRING_LENGTH (entry),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 else if (GLYPHP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 if (!data->start_col && data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 prop = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 gb.glyph = entry;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 else if (CHAR_OR_CHAR_INTP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 data->ch = XCHAR_OR_CHAR_INT (entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 }
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1270 else if (CONSP (entry))
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1271 {
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1272 if (EQ (XCAR (entry), Qformat)
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1273 && CONSP (XCDR (entry))
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1274 && STRINGP (XCAR (XCDR (entry))))
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1275 {
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1276 Lisp_Object format = XCAR (XCDR (entry));
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1277 Bytind len = XSTRING_LENGTH (format);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1278 Bufbyte *src = XSTRING_DATA (format), *end = src + len;
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1279 Bufbyte *result = alloca_array (Bufbyte, len);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1280 Bufbyte *dst = result;
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1281
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1282 while (src < end)
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1283 {
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1284 Emchar c = charptr_emchar (src);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1285 INC_CHARPTR (src);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1286 if (c != '%' || src == end)
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1287 dst += set_charptr_emchar (dst, c);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1288 else
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1289 {
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1290 c = charptr_emchar (src);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1291 INC_CHARPTR (src);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1292 switch (c)
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1293 {
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1294 /*case 'x':
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1295 dst += long_to_string_base ((char *)dst, data->ch, 16);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1296 break;*/
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1297 case '%':
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1298 dst += set_charptr_emchar (dst, '%');
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1299 break;
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1300 }
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1301 }
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1302 }
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1303 prop = add_bufbyte_string_runes (data, result, dst - result, 0);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1304 }
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1305 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 /* Else blow it off because someone added a bad entry and we don't
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1308 have any safe way of signaling an error. */
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1309 return prop;
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1310 }
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1311
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1312 /* Given a display table entry, call the appropriate functions to
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1313 display each element of the entry. */
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1314
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1315 static prop_block_dynarr *
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1316 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1317 {
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1318 prop_block_dynarr *prop = NULL;
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1319 if (VECTORP (entry))
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1320 {
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1321 struct Lisp_Vector *de = XVECTOR (entry);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1322 EMACS_INT len = vector_length (de);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1323 int elt;
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1324
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1325 for (elt = 0; elt < len; elt++)
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1326 {
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1327 if (NILP (vector_data (de)[elt]))
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1328 continue;
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1329 else
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1330 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1331 /* Else blow it off because someone added a bad entry and we
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1332 don't have any safe way of signaling an error. Hey, this
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1333 comment sounds familiar. */
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1334
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1335 /* #### Still need to add any remaining elements to the
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1336 propagation information. */
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1337 if (prop)
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1338 return prop;
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1339 }
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1340 }
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1341 else
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1342 prop = add_disp_table_entry_runes_1 (data, entry);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 /* Add runes which were propagated from the previous line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 /* #### Remember to handle start_col parameter of data when the rest of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 this is finished. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353 /* #### Chuck -- I've redone this function a bit. It looked like the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 case of not all the propagation blocks being added was not handled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 well. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 /* #### Chuck -- I also think the double indirection of PROP is kind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 of bogus. A cleaner solution is just to check for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 Dynarr_length (prop) > 0. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 /* #### This function also doesn't even pay attention to ADD_FAILED!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 This is seriously fucked! Seven ####'s in 130 lines -- is that a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 record? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 prop_block_dynarr *add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 for (elt = 0; elt < Dynarr_length (*prop); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 struct prop_block *pb = Dynarr_atp (*prop, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 switch (pb->type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 case PROP_CHAR:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 data->ch = pb->data.p_char.ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 data->bi_cursor_bufpos = pb->data.p_char.bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 data->cursor_type = pb->data.p_char.cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 add_failed = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 case PROP_STRING:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 if (pb->data.p_string.str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 xfree (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 /* #### bogus bogus -- this doesn't do anything!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 Should probably call add_bufbyte_string_runes(),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 once that function is fixed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 case PROP_MINIBUF_PROMPT:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 Bytind bi_old_bufpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 data->findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395 data->bi_bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 while (pb->data.p_string.len > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 data->ch = charptr_emchar (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 add_failed = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 data->bi_bufpos = bi_old_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 /* Complicated equivalent of ptr++, len-- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 Bufbyte *oldpos = pb->data.p_string.str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 INC_CHARPTR (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 /* ##### FIXME FIXME FIXME -- Upon successful return from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 this function, data->bi_bufpos is automatically incremented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 However, we don't want that to happen if we were adding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422 the minibuffer prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 struct buffer *buf =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 /* #### Chuck fix this shit or I'm gonna scream! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 if (bi_old_bufpos > BI_BUF_BEGV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 data->bi_bufpos = prev_bytind (buf, bi_old_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 /* #### is this correct? Does anyone know?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 Does anyone care? Is this a cheesy hack or what? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 data->bi_bufpos = BI_BUF_BEGV (buf) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 case PROP_BLANK:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 /* #### I think it's unnecessary and misleading to preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 the blank_width, as it implies that the value carries
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 over from one rune to the next, which is wrong. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 int old_width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 data->findex = pb->data.p_blank.findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 data->blank_width = pb->data.p_blank.width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 data->bi_cursor_bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 if (data->pixpos + data->blank_width > data->max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 data->blank_width = data->max_pixpos - data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 /* We pass a bogus value of char_tab_width. It shouldn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 matter because unless something is really screwed up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 this call won't cause that arg to be used. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 /* This can happen in the case where we have a tab which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 is wider than the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 if (data->blank_width != pb->data.p_blank.width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 pb->data.p_blank.width -= data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 add_failed = ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 data->blank_width = old_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 default:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 oops_no_more_space:
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
1478
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 if (elt < Dynarr_length (*prop))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 Dynarr_delete_many (*prop, 0, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 return *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493 /* Add 'text layout glyphs at position POS_TYPE that are contained to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 the display block, but add all other types to the appropriate list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 of the display line. They will be added later by different
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 int allow_cursor, struct glyph_cachel *cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 /* A nil extent indicates a special glyph (ex. truncator). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 if (NILP (gb->extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 || (pos_type == BEGIN_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 || (pos_type == END_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 int xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 int ascent, descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515 Lisp_Object baseline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 if (cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 width = cachel->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 width = glyph_width (gb->glyph, Qnil, data->findex, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 if (!width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 return NULL;
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 (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 int glyph_char_width = width / space_width (w);
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 we still have not fully scrolled horizontally after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 taking into account the width of the glyph, subtract its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 width and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 if (glyph_char_width < data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 data->start_col -= glyph_char_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 else if (glyph_char_width == data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 xoffset = space_width (w) * data->start_col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 width -= xoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 /* #### Can this happen? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 if (width < 0)
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 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 data->start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 /* Could be caused by the handling of the hscroll rune. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 if (retval != NULL || !width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 if (data->pixpos + width > data->max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 /* If this is the first object we are attempting to add to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 the line then we ignore the horizontal_clip threshold.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 Otherwise we will loop until the bottom of the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 continually failing to add this glyph because it is wider
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 than the window. We could alternatively just completely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 ignore the glyph and proceed from there but I think that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 this is a better solution. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570 if (Dynarr_length (data->db->runes)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 && data->max_pixpos - data->pixpos < horizontal_clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574 width = data->max_pixpos - data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577 if (cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579 ascent = cachel->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 descent = cachel->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 ascent = glyph_ascent (gb->glyph, Qnil, data->findex, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 descent = glyph_descent (gb->glyph, Qnil, data->findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586 data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 baseline = glyph_baseline (gb->glyph, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 if (glyph_contrib_p (gb->glyph, data->window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 /* A pixmap that has not had a baseline explicitly set. Its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 contribution will be determined later. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 if (NILP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598 data->max_pixmap_height = max (data->max_pixmap_height, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599 }
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 string so determine contribution normally. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 else if (EQ (baseline, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 data->new_ascent = max (data->new_ascent, ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605 data->new_descent = max (data->new_descent, descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 /* A pixmap with an explicitly set baseline. We determine the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 contribution here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 else if (INTP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 int pix_ascent, pix_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 pix_ascent = height * XINT (baseline) / 100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 pix_descent = height - pix_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 data->new_ascent = max (data->new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 data->new_descent = max (data->new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622 /* Otherwise something is screwed up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 face = glyph_face (gb->glyph, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 if (NILP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 rb.findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 rb.findex = get_builtin_face_cache_index (w, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 rb.xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 rb.width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 rb.bufpos = 0; /* glyphs are never "at" anywhere */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 if (data->bi_endpos)
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1637 /* #### is this necessary at all? */
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1638 rb.endpos = bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (w)),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1639 data->bi_endpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 rb.type = RUNE_DGLYPH;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 /* #### Ben sez: this is way bogus if the glyph is a string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 You should not make the output routines have to cope with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 this. The string could contain Mule characters, or non-
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646 printable characters, or characters to be passed through
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647 the display table, or non-character objects (when this gets
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 implemented), etc. Instead, this routine here should parse
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 the string into a series of runes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 rb.object.dglyph.glyph = gb->glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1651 rb.object.dglyph.extent = gb->extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 rb.object.dglyph.xoffset = xoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 if (allow_cursor)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1655 {
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1656 rb.bufpos = bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (w)),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1657 data->bi_bufpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 else if (data->cursor_type == NEXT_CURSOR)
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 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 else if (data->cursor_type == IGNORE_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 rb.cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 else if (data->cursor_type == NO_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 rb.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 Dynarr_add (data->db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686 data->pixpos += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 return NULL;
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 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692 if (!NILP (glyph_face (gb->glyph, data->window)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1693 gb->findex =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695 data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697 gb->findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 if (pos_type == BEGIN_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 if (!data->dl->left_glyphs)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1702 data->dl->left_glyphs = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 Dynarr_add (data->dl->left_glyphs, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 else if (pos_type == END_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 if (!data->dl->right_glyphs)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1709 data->dl->right_glyphs = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 Dynarr_add (data->dl->right_glyphs, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 abort (); /* there are no unknown types */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 return NULL; /* shut up compiler */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 /* Add all glyphs at position POS_TYPE that are contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 data. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 add_glyph_runes (pos_data *data, int pos_type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727 why didn't you just modify add_glyph_rune in the first place? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 ? data->ef->begin_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 : data->ef->end_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741 /* #### Add some propagation information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746 Dynarr_reset (glyph_arr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751 /* Given a position for a buffer in a window, ensure that the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 display line DL accurately represents the text on a line starting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 at the given position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 NOTE NOTE NOTE NOTE: This function works with and returns Bytinds.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756 You must do appropriate conversion. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758 static Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 create_text_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 Bytind bi_start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 prop_block_dynarr **prop, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767 pos_data data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769 /* Don't display anything in the minibuffer if this window is not on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770 a selected frame. We consider all other windows to be active
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771 minibuffers as it simplifies the coding. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772 int active_minibuffer = (!MINI_WINDOW_P (w) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 (f == device_selected_frame (d)) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 is_surrogate_for_selected_frame (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 int truncate_win = window_truncation_on (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777 int end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 /* If the buffer's value of selective_display is an integer then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 only lines that start with less than selective_display columns of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 space will be displayed. If selective_display is t then all text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782 after a ^M is invisible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 int selective = (INTP (b->selective_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784 ? XINT (b->selective_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 : ((!NILP (b->selective_display) ? -1 : 0)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 /* The variable ctl-arrow allows the user to specify what characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 can actually be displayed and which octal should be used for.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789 #### This variable should probably have some rethought done to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 #### It would also be really nice if you could specify that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 the characters come out in hex instead of in octal. Mule
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1794 does that by adding a ctl-hexa variable similar to ctl-arrow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 but that's bogus -- we need a more general solution. I
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 think you need to extend the concept of display tables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 into a more general conversion mechanism. Ideally you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 could specify a Lisp function that converts characters,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 but this violates the Second Golden Rule and besides would
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 make things way way way way slow. An idea I like is to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 be able to specify multiple display tables instead of just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 one. Each display table can specify conversions for some
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 characters and leave others unchanged. The way the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 character gets displayed is determined by the first display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 table with a binding for that character. This way, you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 could call a function `enable-hex-display' that adds a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 pre-defined hex display-table (or maybe computes one if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 you give weird parameters to the function) and adds it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 to the list of display tables for the current buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 Unfortunately there are still problems dealing with Mule
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812 characters. For example, maybe I want to specify that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 all extended characters (i.e. >= 256) are displayed in hex.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 It's not reasonable to create a mapping for all possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 such characters, because there are about 2^19 of them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 One way of dealing with this is to extend the concept
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817 of what a display table is. Currently it's only allowed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 to be a 256-entry vector. Instead, it should be something
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 like:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1820
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 a) A 256-entry vector, for backward compatibility
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 b) Some sort of hashtable, mapping characters to values
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823 c) A list that specifies a range of values and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824 mapping to provide for those values.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 Also, extend the concept of "mapping" to include a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 printf-like spec. Then, you could make all extended
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828 characters show up as hex with a display table like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 ((256 . 524288) . "%x")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832 Since more than one display table is possible, you have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833 great flexibility in mapping ranges of characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 Emchar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 ? 255 : 160));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1840 Lisp_Object face_dt, window_dt;
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1841
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842 /* The text display block for this display line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845 /* The first time through the main loop we need to force the glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 data to be updated. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 int initial = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 /* Apparently the new extent_fragment_update returns an end position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 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
1851 displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852 int no_more_frags = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 Lisp_Object synch_minibuffers_value =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
1856
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 dl->used_prop_data = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 dl->num_chars = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
1860 xzero (data);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 data.ef = extent_fragment_new (w->buffer, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 /* These values are used by all of the rune addition routines. We add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 them to this structure for ease of passing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 data.db = db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 data.bi_bufpos = bi_start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871 data.pixpos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872 data.last_charset = Qunbound;
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
1873 data.last_findex = DEFAULT_INDEX;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 data.result_str = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 /* Set the right boundary adjusting it to take into account any end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877 glyph. Save the width of the end glyph for later use. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878 data.max_pixpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 data.max_pixpos -= end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
1885 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
1886 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
1887 data.bi_cursor_bufpos = BI_BUF_ZV (b);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
1888 data.cursor_type = CURSOR_ON;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 else if (MINI_WINDOW_P (w) && !active_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 data.cursor_type = NO_CURSOR;
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1892 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1893 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1894 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1895 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897 data.bi_cursor_bufpos = BI_BUF_PT (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 data.bi_cursor_bufpos = bi_marker_position (w->pointm[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 data.cursor_x = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 data.start_col = w->hscroll;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910 data.bi_start_col_enabled = (w->hscroll ? bi_start_pos : 0);
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
1911 data.hscroll_glyph_width_adjust = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913 /* We regenerate the line from the very beginning. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916 /* 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
1917 starting position is already equal to the maximum we can't add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1918 anything else, right? Wrong. We might still have a newline to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919 add. A newline can use the room allocated for an end glyph since
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 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
1921 glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1922
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923 /* #### Chuck -- I think this condition should be while (1).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 and the begin-glyph ends exactly at the end of the window, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926 end-glyph and text might not be displayed. while (1) ensures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 that the loop terminates only when either (a) there is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 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
1929
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1930 #### Also I think you need to ensure that the operation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931 "add begin glyphs; add end glyphs; add text" is atomic and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 can't get interrupted in the middle. If you run off the end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933 of the line during that operation, then you keep accumulating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1934 propagation data until you're done. Otherwise, if the (e.g.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935 there's a begin glyph at a particular position and attempting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 to display that glyph results in window-end being hit and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937 propagation data being generated, then the character at that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 position won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1940 #### See also the comment after the end of this loop, below.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942 while (data.pixpos <= data.max_pixpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 && (active_minibuffer || !NILP (synch_minibuffers_value)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 /* #### This check probably should not be necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946 if (data.bi_bufpos > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 /* #### urk! More of this lossage! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 data.bi_bufpos--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1950 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 /* If selective display was an integer and we aren't working on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 a continuation line then find the next line we are actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 supposed to display. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 if (selective > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 && (data.bi_bufpos == BI_BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958 || BUF_FETCH_CHAR (b, prev_bytind (b, data.bi_bufpos)) == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 data.bi_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 if (data.bi_bufpos >= BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 data.bi_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972 /* Check for face changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973 if (initial || (!no_more_frags && data.bi_bufpos == data.ef->end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 /* Now compute the face and begin/end-glyph information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 data.findex =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 /* Remember that the extent-fragment routines deal in Bytind's. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 extent_fragment_update (w, data.ef, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1980 get_display_tables (w, data.findex, &face_dt, &window_dt);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
1981
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982 if (data.bi_bufpos == data.ef->end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 no_more_frags = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985 initial = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 /* Determine what is next to be displayed. We first handle any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 glyphs returned by glyphs_at_bufpos. If there are no glyphs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989 display then we determine what to do based on the character at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 current buffer position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1992 /* If the current position is covered by an invisible extent, do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993 nothing (except maybe add some ellipses).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995 #### The behavior of begin and end-glyphs at the edge of an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 invisible extent should be investigated further. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 fairly low priority though. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 if (data.ef->invisible)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000 /* #### Chuck, perhaps you could look at this code? I don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001 really know what I'm doing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 *prop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008 /* The extent fragment code only sets this when we should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009 really display the ellipses. It makes sure the ellipses
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010 don't get displayed more than once in a row. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011 if (data.ef->invisible_ellipses)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2013 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2014
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2015 data.ef->invisible_ellipses_already_displayed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016 data.ef->invisible_ellipses = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2021 /* Perhaps they shouldn't propagate if the very next thing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2022 is to display a newline (for compatibility with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023 selective-display-ellipses)? Maybe that's too
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 abstruse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 /* If point is in an invisible region we place it on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 next visible character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 && data.bi_bufpos == data.bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 data.cursor_type = NEXT_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 /* #### What if we we're dealing with a display table? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038 if (data.start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 data.start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2041 if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 /* If there is propagation data, then it represents the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 buffer position being displayed. Add them and advance the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 position counter. This might also add the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 else if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053 dl->used_prop_data = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 *prop = add_propagation_runes (prop, &data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057 goto done; /* gee, a really narrow window */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 else if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 else if (data.bi_bufpos < BI_BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 data.bi_bufpos = BI_BUF_BEGV (b);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2063 else
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 /* If there are end glyphs, add them to the line. These are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068 the end glyphs for the previous run of text. We add them
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 here rather than doing them at the end of handling the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070 previous run so that glyphs at the beginning and end of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071 a line are handled correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 else if (Dynarr_length (data.ef->end_glyphs) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 *prop = add_glyph_runes (&data, END_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079 /* If there are begin glyphs, add them to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087 /* If at end-of-buffer, we've already processed begin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088 end-glyphs at this point and there's no text to process,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089 so we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 else if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2092
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094 {
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
2095 Lisp_Object entry = Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 /* Get the character at the current buffer position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
2098 if (!NILP (face_dt) || !NILP (window_dt))
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
2099 entry = display_table_entry (data.ch, face_dt, window_dt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101 /* If there is a display table entry for it, hand it off to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 add_disp_table_entry_runes and let it worry about it. */
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
2103 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104 {
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
2105 *prop = add_disp_table_entry_runes (&data, entry);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2107 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 /* Check if we have hit a newline character. If so, add a marker
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112 to the line and end this loop. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 else if (data.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 /* We aren't going to be adding an end glyph so give its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 space back in order to make sure that the cursor can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 fit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120 if (selective > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121 && (bi_spaces_at_point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 (b, next_bytind (b, data.bi_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123 >= selective))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125 if (!NILP (b->selective_display_ellipses))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 /* Cheesy, cheesy, cheesy. We mark the end of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 line with a special "character rune" whose width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138 is the EOL cursor width and whose character is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139 the non-printing character '\n'. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2140 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 /* We need to set data.bi_bufpos to the start of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145 next visible region in order to make this line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146 appear to contain all of the invisible area.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147 Otherwise, the line cache won't work
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2151 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2152 data.bi_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 if (data.bi_bufpos >= BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156 data.bi_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 if (BI_BUF_FETCH_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161 (b, prev_bytind (b, data.bi_bufpos)) == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162 DEC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2163 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2169
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2170 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2171 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 /* If the current character is ^M, and selective display is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174 enabled, then add the invisible-text-glyph if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175 selective-display-ellipses is set. In any case, this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176 line is done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 else if (data.ch == (('M' & 037)) && selective == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 Bytind bi_next_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181 /* Find the buffer position at the end of the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182 bi_next_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184 if (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_next_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185 == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186 DEC_BYTIND (b, bi_next_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2187
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2188 /* If the cursor is somewhere in the elided text make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189 sure that the cursor gets drawn appropriately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191 && (data.bi_cursor_bufpos >= data.bi_bufpos &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2192 data.bi_cursor_bufpos < bi_next_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2193 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2194 data.cursor_type = NEXT_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2195 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2196
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2197 /* We won't be adding a truncation or continuation glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2198 so give up the room allocated for them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2199 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2201 if (!NILP (b->selective_display_ellipses))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2202 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2203 /* We don't propagate anything from the invisible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2204 text glyph if it fails to fit. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2205 intentional. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2206 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2208 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2209 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2210 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2211 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2212 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2213
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2214 /* Set the buffer position to the end of the line. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2215 need to do this before potentially adding a newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2216 so that the cursor flag will get set correctly (if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2217 needed). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2218 data.bi_bufpos = bi_next_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2220 if (NILP (b->selective_display_ellipses)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2221 || data.bi_cursor_bufpos == bi_next_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2222 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2223 /* We have to at least add a newline character so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2224 that the cursor shows up properly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2225 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2226 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2227 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2228 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2229 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2230
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2231 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2232 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2234 /* This had better be a newline but doing it this way
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2235 we'll see obvious incorrect results if it isn't. No
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2236 need to abort here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2237 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2238
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2239 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2240 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2242 /* If the current character is considered to be printable, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2243 just add it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2244 else if (data.ch >= printable_min)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2245 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2246 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2247 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2248 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2249 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2251 /* If the current character is a tab, determine the next tab
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2252 starting position and add a blank rune which extends from the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2253 current pixel position to that starting position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2254 else if (data.ch == '\t')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2255 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2256 int tab_start_pixpos = data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2257 int next_tab_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2258 int char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2259 int prop_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2260
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2261 if (data.start_col > 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2262 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2263
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2264 next_tab_start =
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2265 next_tab_position (w, tab_start_pixpos,
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2266 dl->bounds.left_in +
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2267 data.hscroll_glyph_width_adjust);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2268 if (next_tab_start > data.max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2269 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2270 prop_width = next_tab_start - data.max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2271 next_tab_start = data.max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2272 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2273 data.blank_width = next_tab_start - data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2274 char_tab_width =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2275 (next_tab_start - tab_start_pixpos) / space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2276
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2277 *prop = add_blank_rune (&data, w, char_tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2278
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2279 /* add_blank_rune is only supposed to be called with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2280 sizes guaranteed to fit in the available space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2281 assert (!(*prop));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2282
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2283 if (prop_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2284 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2285 struct prop_block pb;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2286 *prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2288 pb.type = PROP_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2289 pb.data.p_blank.width = prop_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2290 pb.data.p_blank.findex = data.findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2291 Dynarr_add (*prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2292
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2293 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2294 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2295 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2297 /* If character is a control character, pass it off to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2298 add_control_char_runes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2300 The is_*() routines have undefined results on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2301 arguments outside of the range [-1, 255]. (This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2302 often bites people who carelessly use `char' instead
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2303 of `unsigned char'.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2304 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2305 else if (data.ch < 0x100 && iscntrl ((Bufbyte) data.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2306 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2307 *prop = add_control_char_runes (&data, b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2308
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2309 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2310 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2311 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2312
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2313 /* If the character is above the ASCII range and we have not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2314 already handled it, then print it as an octal number. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2315 else if (data.ch >= 0200)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2316 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2317 *prop = add_octal_runes (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2319 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2320 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2321 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2323 /* Assume the current character is considered to be printable,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2324 then just add it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2325 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2326 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2327 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2328 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2329 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2330 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2331
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2332 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2333 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2334 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2336 done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2337
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2338 /* 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
2339 end of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2340 if (data.bi_bufpos < BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2341 && (active_minibuffer || !NILP (synch_minibuffers_value)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2342 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2343 /* #### This check is not correct. If the line terminated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2344 due to a begin-glyph or end-glyph hitting window-end, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2345 data.ch will not point to the character at data.bi_bufpos. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2346 you make the two changes mentioned at the top of this loop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2347 you should be able to say '(if (*prop))'. That should also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2348 make it possible to eliminate the data.bi_bufpos < BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2349 check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2351 /* The common case is that the line ended because we hit a newline.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2352 In that case, the next character is just the next buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2353 position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2354 if (data.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2355 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2356 /* If data.start_col_enabled is still true, then the window is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2357 scrolled far enough so that nothing on this line is visible.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2358 We need to stick a trunctation glyph at the beginning of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2359 line in that case unless the line is completely blank. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2360 if (data.bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2361 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2362 if (data.cursor_type == CURSOR_ON)
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.bi_cursor_bufpos >= bi_start_pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2365 && data.bi_cursor_bufpos <= data.bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2366 data.bi_cursor_bufpos = data.bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2367 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2368 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2369 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2370 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2371
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2372 if (data.bi_bufpos != bi_start_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2373 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2374 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2376 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2377 gb.glyph = Vhscroll_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2378 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2379 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2380 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2381 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2382 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2383 /* This duplicates code down below to add a newline to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2384 the end of an otherwise empty line.*/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2385 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2386 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2387
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2388 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2389 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2390 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2392 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2393 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2394
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2395 /* Otherwise we have a buffer line which cannot fit on one display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2396 line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2397 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2398 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2399 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2400 struct glyph_cachel *cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2401
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2402 /* If the line is to be truncated then we actually have to look
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2403 for the next newline. We also add the end-of-line glyph which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2404 we know will fit because we adjusted the right border before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2405 we starting laying out the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2406 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2407 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2408 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2409
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2410 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2411 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2412 Bytind bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2414 /* Now find the start of the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2415 bi_pos = bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2416
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2417 /* If the cursor is past the truncation line then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2418 make it appear on the truncation glyph. If we've hit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2419 the end of the buffer then we also make the cursor
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
2420 appear unless eob is immediately preceded by a
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2421 newline. In that case the cursor should actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2422 appear on the next line. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2423 if (data.cursor_type == CURSOR_ON
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2424 && data.bi_cursor_bufpos >= data.bi_bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2425 && (data.bi_cursor_bufpos < bi_pos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2426 (bi_pos == BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2427 && (bi_pos == BI_BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2428 || (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2429 != '\n')))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2430 data.bi_cursor_bufpos = bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2431 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2432 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2433
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2434 data.bi_bufpos = bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2435 gb.glyph = Vtruncation_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2436 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2437 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2438 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2439 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2440 /* The cursor can never be on the continuation glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2441 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2442
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2443 /* data.bi_bufpos is already at the start of the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2445 gb.glyph = Vcontinuation_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2446 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2447 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2449 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1, cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2451 if (truncate_win && data.bi_bufpos == BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2452 && BI_BUF_FETCH_CHAR (b, prev_bytind (b, BI_BUF_ZV (b))) != '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2453 /* #### Damn this losing shit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2454 data.bi_bufpos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2455 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2456 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2457 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2458 && (!echo_area_active (f) || data.bi_bufpos == BI_BUF_ZV (b)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2459 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2460 /* 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
2461 newline character in order for the cursor to get drawn. We label
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2462 it as a newline so that it gets handled correctly by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2463 whitespace routines below. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2464
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2465 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2466 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2467 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2468 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2469 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2471 data.max_pixpos += data.blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2472 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2473 data.max_pixpos -= data.blank_width;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2474
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2475 /* #### urk! Chuck, this shit is bad news. Going around
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2476 manipulating invalid positions is guaranteed to result in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2477 trouble sooner or later. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2478 data.bi_bufpos = BI_BUF_ZV (b) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2479 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2480
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2481 /* Calculate left whitespace boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2482 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2483 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2484
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2485 /* Whitespace past a newline is considered right whitespace. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2486 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2487 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2488 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2489
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2490 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2491 || rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2492 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2493 dl->bounds.left_white += rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2494 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2495 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2496 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2497 elt = Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2498 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2499 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2500
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2501 /* Calculate right whitespace boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2502 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2503 int elt = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2504 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2505
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2506 while (!done && elt >= 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 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2509
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2510 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2511 && isspace (rb->object.chr.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2512 && !rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2513 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2514 dl->bounds.right_white = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2515 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2516 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2517
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2518 elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2519
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2520 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2521
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2522 /* The line is blank so everything is considered to be right
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2523 whitespace. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2524 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2525 dl->bounds.right_white = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2526 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2527
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2528 /* Set the display blocks bounds. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2529 db->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2530 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2531 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2532 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2534 db->end_pos = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2535 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2536 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2537 db->end_pos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2538
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2539 /* update line height parameters */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2540 if (!data.new_ascent && !data.new_descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2541 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2542 /* We've got a blank line so initialize these values from the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2543 face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2544 default_face_font_info (data.window, &data.new_ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2545 &data.new_descent, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2546 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2547
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2548 if (data.max_pixmap_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2549 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2550 int height = data.new_ascent + data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2551 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2552
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2553 pix_descent = data.max_pixmap_height * data.new_descent / height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2554 pix_ascent = data.max_pixmap_height - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2556 data.new_ascent = max (data.new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2557 data.new_descent = max (data.new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2558 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2559
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2560 dl->ascent = data.new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2561 dl->descent = data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2562
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2563 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2564 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2566 if (dl->ascent < ascent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2567 dl->ascent = ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2568 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2569 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2570 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2571
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2572 if (dl->descent < descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2573 dl->descent = descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2574 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2575
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2576 dl->cursor_elt = data.cursor_x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2577 /* #### lossage lossage lossage! Fix this shit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2578 if (data.bi_bufpos > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2579 dl->end_bufpos = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2580 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2581 dl->end_bufpos = bytind_to_bufpos (b, data.bi_bufpos) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2582 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2583 data.dl->num_chars = column_at_point (b, dl->end_bufpos, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2584 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2585 /* This doesn't correctly take into account tabs and control
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2586 characters but if the window isn't being truncated then this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2587 value isn't going to end up being used anyhow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2588 data.dl->num_chars = dl->end_bufpos - dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2589
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2590 /* #### handle horizontally scrolled line with text none of which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2591 was actually laid out. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2592
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2593 /* #### handle any remainder of overlay arrow */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2595 if (*prop == ADD_FAILED)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2596 *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2597
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2598 if (truncate_win && *prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2599 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2600 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2601 *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2602 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2603
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2604 extent_fragment_delete (data.ef);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2605
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2606 /* #### If we started at EOB, then make sure we return a value past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2607 it so that regenerate_window will exit properly. This is bogus.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2608 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
2609 this function if we are already at EOB. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2611 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
2612 return data.bi_bufpos + 1; /* Yuck! */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2613 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2614 return data.bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2615 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2617 /* Display the overlay arrow at the beginning of the given line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2618
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2619 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2620 create_overlay_glyph_block (struct window *w, struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2621 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2622 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2623 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2624 pos_data data;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2625
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2626 /* If Voverlay_arrow_string isn't valid then just fail silently. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2627 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2628 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2629
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2630 xzero (data);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2631 data.ef = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2632 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2633 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2634 data.db = get_display_block_from_line (dl, OVERWRITE);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2635 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2636 data.pixpos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2637 data.max_pixpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2638 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2639 data.cursor_x = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2640 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2641 data.last_charset = Qunbound;
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
2642 data.last_findex = DEFAULT_INDEX;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2643 data.result_str = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2644
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2645 Dynarr_reset (data.db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2647 if (STRINGP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2648 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2649 add_bufbyte_string_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2650 (&data,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
2651 XSTRING_DATA (Voverlay_arrow_string),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
2652 XSTRING_LENGTH (Voverlay_arrow_string),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2653 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2654 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2655 else if (GLYPHP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2656 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2657 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2658
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2659 gb.glyph = Voverlay_arrow_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2660 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2661 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2662 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2663
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2664 if (data.max_pixmap_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2665 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2666 int height = data.new_ascent + data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2667 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2668
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2669 pix_descent = data.max_pixmap_height * data.new_descent / height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2670 pix_ascent = data.max_pixmap_height - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2672 data.new_ascent = max (data.new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2673 data.new_descent = max (data.new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2674 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2675
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2676 dl->ascent = data.new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2677 dl->descent = data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2678
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2679 data.db->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2680 data.db->end_pos = data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2681
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
2682 return data.pixpos - dl->bounds.left_in;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2683 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2684
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2685 /* Add a type of glyph to a margin display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2687 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2688 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
2689 int count, enum glyph_layout layout, int side, Lisp_Object window)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2690 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2691 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2692 ? dl->left_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2693 : dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2694 int elt, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2695 int xpos = start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2696 int reverse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2697
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2698 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2699 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2700 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2701 reverse = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2702 elt = Dynarr_length (gbd) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2703 end = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2704 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2705 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2706 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2707 reverse = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2708 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2709 end = Dynarr_length (gbd);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2710 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2711
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2712 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2713 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2714 struct glyph_block *gb = Dynarr_atp (gbd, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2715
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2716 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2717 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2718
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2719 if (gb->active &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2720 ((side == LEFT_GLYPHS &&
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2721 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2722 || (side == RIGHT_GLYPHS &&
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
2723 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2724 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2725 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2726
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2727 rb.width = gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2728 rb.findex = gb->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2729 rb.xpos = xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2730 rb.bufpos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2731 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2732 rb.type = RUNE_DGLYPH;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2733 rb.object.dglyph.glyph = gb->glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2734 rb.object.dglyph.extent = gb->extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2735 rb.object.dglyph.xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2736 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2737
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2738 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2739 xpos += rb.width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2740 count--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2741 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2742
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2743 if (glyph_contrib_p (gb->glyph, window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2744 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2745 unsigned short ascent, descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2746 Lisp_Object baseline = glyph_baseline (gb->glyph, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2748 ascent = glyph_ascent (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2749 descent = glyph_descent (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2750
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2751 /* A pixmap that has not had a baseline explicitly set.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2752 We use the existing ascent / descent ratio of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2753 line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2754 if (NILP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2755 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2756 int gheight = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2757 int line_height = dl->ascent + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2758 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2759
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2760 pix_descent = (int) (gheight * dl->descent) / line_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2761 pix_ascent = gheight - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2762
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2763 dl->ascent = max ((int) dl->ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2764 dl->descent = max ((int) dl->descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2765 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2766
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2767 /* A string so determine contribution normally. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2768 else if (EQ (baseline, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2769 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2770 dl->ascent = max (dl->ascent, ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2771 dl->descent = max (dl->descent, descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2772 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2773
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2774 /* A pixmap with an explicitly set baseline. We determine the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2775 contribution here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2776 else if (INTP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2777 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2778 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2779 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2780
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2781 pix_ascent = height * XINT (baseline) / 100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2782 pix_descent = height - pix_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2783
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2784 dl->ascent = max ((int) dl->ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2785 dl->descent = max ((int) dl->descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2786 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2788 /* Otherwise something is screwed up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2789 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2790 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2791 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2792 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2794 (reverse ? elt-- : elt++);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2795 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2797 return xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2798 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2799
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2800 /* Add a blank to a margin display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2802 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2803 add_margin_blank (struct display_line *dl, struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2804 struct window *w, int xpos, int width, int side)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2805 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2806 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2808 rb.findex = (side == LEFT_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2809 ? get_builtin_face_cache_index (w, Vleft_margin_face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2810 : get_builtin_face_cache_index (w, Vright_margin_face));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2811 rb.xpos = xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2812 rb.width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2813 rb.bufpos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2814 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2815 rb.type = RUNE_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2816 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2817
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2818 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2819 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2820
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2821 /* Display glyphs in the left outside margin, left inside margin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2822 left whitespace area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2824 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2825 create_left_glyph_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2826 int overlay_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2827 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2828 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2830 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2831 int elt, end_xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2832 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
2833 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
2834 int left_in_start = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2835 int left_in_end = dl->bounds.left_in + overlay_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2836
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2837 struct display_block *odb, *idb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2839 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2840
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2841 /* We have to add the glyphs to the line in the order outside,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2842 inside, whitespace. However the precedence dictates that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2843 determine how many will fit in the reverse order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2844
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2845 /* Determine how many whitespace glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2846 they should start. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2847 white_in_start = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2848 white_out_start = left_in_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2849 white_out_cnt = white_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2850 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2851
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2852 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2853 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2854 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2856 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2857 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2858
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2859 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2860 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2861 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2862
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2863 width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2864
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2865 if (white_in_start - width >= left_in_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2866 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2867 white_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2868 white_in_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2869 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2870 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2871 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2872 else if (use_overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2873 && (white_out_start - width > dl->bounds.left_out))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2874 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2875 white_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2876 white_out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2877 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2878 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2879 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2880 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2881 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2882 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2883
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2884 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2885 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2887 /* Determine how many inside margin glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2888 they should start. The inside margin glyphs get whatever space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2889 is left after the whitespace glyphs have been displayed. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2890 are tricky to calculate since if we decide to use the overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2891 area we basicaly have to start over. So for these we build up a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2892 list of just the inside margin glyphs and manipulate it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2893 determine the needed info. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2894 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2895 glyph_block_dynarr *ib;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2896 int avail_in, avail_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2897 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2898 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2899 int used_in, used_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2900
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2901 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2902 used_in = used_out = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2903 ib = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2904 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2905 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2906 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2907
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2908 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2909 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2911 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2912 GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2913 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2914 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2915 used_in += gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2916 Dynarr_add (ib, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2917 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2918
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2919 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2920 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2921
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2922 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2923 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2924 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2925 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2926 avail_in = white_in_start - left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2927 if (avail_in < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2928 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2929 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2930
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2931 if (!use_overflow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2932 avail_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2933 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2934 avail_out = white_out_start - dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2935
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2936 marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2937 while (!done && marker < Dynarr_length (ib))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2938 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2939 int width = Dynarr_atp (ib, marker)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2940
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2941 /* If everything now fits in the available inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2942 space, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2943 if (used_in <= avail_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2944 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2945 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2946 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2947 /* Otherwise see if we have room to move a glyph to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2948 outside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2949 if (used_out + width <= avail_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2950 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2951 used_out += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2952 used_in -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2953 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2954 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2955 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2956 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2957
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2958 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2959 marker++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2960 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2962 /* At this point we now know that everything from marker on goes in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2963 the inside margin and everything before it goes in the outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2964 margin. The stuff going into the outside margin is guaranteed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2965 to fit, but we may have to trim some stuff from the inside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2966
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2967 in_in_end = left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2968 in_out_start = white_out_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2969 in_out_cnt = in_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2970
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2971 Dynarr_free (ib);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2972 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2973 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2974 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2975 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2977 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2978 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2979
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2980 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2981 GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2982 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2983 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2984
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2985 if (used_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2986 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2987 in_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2988 in_out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2989 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2990 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2991 used_out -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2992 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2993 else if (in_in_end + width < white_in_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2994 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2995 in_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2996 in_in_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2997 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2998 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2999 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3000 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3001 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3002 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3003
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3004 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3005 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3006 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3007
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3008 /* Determine how many outside margin glyphs we can display. They
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3009 always start at the left outside margin and can only use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3010 outside margin space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3011 out_end = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3012 out_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3013 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3014
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3015 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3016 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3017 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3019 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3020 abort (); /* these should have beeb handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3022 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3023 GL_OUTSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3024 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3025 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3026
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3027 if (out_end + width <= in_out_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3028 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3029 out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3030 out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3031 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3032 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3033 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3034 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3035 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3036 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3038 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3039 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3040
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
3041 /* Now that we know where everything goes, we add the glyphs as
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
3042 runes to the appropriate display blocks. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3043 if (out_cnt || in_out_cnt || white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3044 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3045 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3046 odb->start_pos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3047 /* #### We should stop adding a blank to account for the space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3048 between the end of the glyphs and the margin and instead set
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3049 this accordingly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3050 odb->end_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3051 Dynarr_reset (odb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3052 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3053 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3054 odb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3055
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3056 if (in_in_cnt || white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3057 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3058 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3059 idb->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3060 /* #### See above comment for odb->end_pos */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3061 idb->end_pos = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3062 Dynarr_reset (idb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3063 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3064 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3065 idb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3066
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3067 /* First add the outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3068 if (out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3069 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3070 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3071 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3072 end_xpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3073
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3074 /* There may be blank space between the outside margin glyphs and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3075 the inside margin glyphs. If so, add a blank. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3076 if (in_out_cnt && (in_out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3077 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3078 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3079 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3080 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3081
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3082 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3083 outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3084 if (in_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3085 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3086 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3087 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3088 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3090 /* If we didn't add any inside margin glyphs to the outside margin,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3091 but are adding whitespace glyphs, then we need to add a blank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3092 here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3093 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3094 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3095 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3096 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3097 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3099 /* Next add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3100 outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3101 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3102 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3103 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3104 GL_WHITESPACE, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3105 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3107 /* We take care of clearing between the end of the glyphs and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3108 start of the inside margin for lines which have glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3109 if (odb && (left_in_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3110 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3111 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3112 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3113 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3114
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3115 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3116 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3117 if (in_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3118 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3119 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3120 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3121 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3122 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3123 end_xpos = left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3125 /* Make sure that the area between the end of the inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3126 glyphs and the whitespace glyphs is cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3127 if (idb && (white_in_start - end_xpos > 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3128 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3129 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3130 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3131 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3132
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3133 /* Next add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3134 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3135 if (white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3136 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3137 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3138 LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3139 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3140
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3141 /* Whitespace glyphs always end right next to the text block so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3142 there is nothing we have to make sure is cleared after them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3143 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3145 /* Display glyphs in the right outside margin, right inside margin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3146 right whitespace area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3147
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3148 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3149 create_right_glyph_block (struct window *w, struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3150 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3151 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3153 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3154 int elt, end_xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3155 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
3156 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
3157
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3158 struct display_block *odb, *idb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3159
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3160 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3162 /* We have to add the glyphs to the line in the order outside,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3163 inside, whitespace. However the precedence dictates that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3164 determine how many will fit in the reverse order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3166 /* Determine how many whitespace glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3167 they should start. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3168 white_in_end = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3169 white_out_end = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3170 white_out_cnt = white_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3171 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3173 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3174 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3175 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3177 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3178 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3180 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3181 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3182 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3183
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3184 if (white_in_end + width <= dl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3185 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3186 white_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3187 white_in_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3188 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3189 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3190 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3191 else if (use_overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3192 && (white_out_end + width <= dl->bounds.right_out))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3193 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3194 white_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3195 white_out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3196 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3197 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3198 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3199 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3200 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3201 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3202
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3203 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3204 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3205
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3206 /* Determine how many inside margin glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3207 they should start. The inside margin glyphs get whatever space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3208 is left after the whitespace glyphs have been displayed. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3209 are tricky to calculate since if we decide to use the overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3210 area we basicaly have to start over. So for these we build up a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3211 list of just the inside margin glyphs and manipulate it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3212 determine the needed info. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3213 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3214 glyph_block_dynarr *ib;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3215 int avail_in, avail_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3216 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3217 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3218 int used_in, used_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3220 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3221 used_in = used_out = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
3222 ib = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3223 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3224 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3225 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3226
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3227 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3228 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3230 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3231 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3232 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3233 used_in += gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3234 Dynarr_add (ib, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3235 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3237 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3238 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3239
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3240 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3241 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3242 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3243 avail_in = dl->bounds.right_in - white_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3244
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3245 if (!use_overflow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3246 avail_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3247 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3248 avail_out = dl->bounds.right_out - white_out_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3249
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3250 marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3251 while (!done && marker < Dynarr_length (ib))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3252 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3253 int width = Dynarr_atp (ib, marker)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3254
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3255 /* If everything now fits in the available inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3256 space, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3257 if (used_in <= avail_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3258 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3259 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3260 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3261 /* Otherwise see if we have room to move a glyph to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3262 outside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3263 if (used_out + width <= avail_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3264 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3265 used_out += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3266 used_in -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3267 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3268 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3269 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3270 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3271
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3272 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3273 marker++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3274 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3275
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3276 /* At this point we now know that everything from marker on goes in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3277 the inside margin and everything before it goes in the outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3278 margin. The stuff going into the outside margin is guaranteed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3279 to fit, but we may have to trim some stuff from the inside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3280
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3281 in_in_start = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3282 in_out_end = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3283 in_out_cnt = in_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3284
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3285 Dynarr_free (ib);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3286 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3287 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3288 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3289 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3291 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3292 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3294 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3295 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3296 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3297
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3298 if (used_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3299 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3300 in_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3301 in_out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3302 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3303 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3304 used_out -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3305 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3306 else if (in_in_start - width >= white_in_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3307 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3308 in_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3309 in_in_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3310 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3311 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3312 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3313 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3314 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3315 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3317 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3318 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3319 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3321 /* Determine how many outside margin glyphs we can display. They
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3322 always start at the right outside margin and can only use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3323 outside margin space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3324 out_start = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3325 out_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3326 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3327
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3328 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3329 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3330 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3331
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3332 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3333 abort (); /* these should have beeb handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3334
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3335 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3336 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3337 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3338
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3339 if (out_start - width >= in_out_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3340 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3341 out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3342 out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3343 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3344 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3345 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3346 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3347 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3348 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3350 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3351 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3352
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3353 /* Now that we now where everything goes, we add the glyphs as runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3354 to the appropriate display blocks. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3355 if (out_cnt || in_out_cnt || white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3356 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3357 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3358 /* #### See comments before odb->start_pos init in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3359 create_left_glyph_block */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3360 odb->start_pos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3361 odb->end_pos = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3362 Dynarr_reset (odb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3363 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3364 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3365 odb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3367 if (in_in_cnt || white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3368 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3369 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3370 idb->start_pos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3371 /* #### See comments before odb->start_pos init in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3372 create_left_glyph_block */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3373 idb->end_pos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3374 Dynarr_reset (idb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3375 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3376 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3377 idb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3379 /* First add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3380 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3381 if (white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3382 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3383 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3384 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3385 window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3386 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3387 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3388 end_xpos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3390 /* Make sure that the area between the end of the whitespace glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3391 and the inside margin glyphs is cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3392 if (in_in_cnt && (in_in_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3393 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3394 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3395 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3396 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3397
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3398 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3399 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3400 if (in_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3401 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3402 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3403 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3404 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3406 /* 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
3407 of the inside margin area gets cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3408 if (idb && (dl->bounds.right_in - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3409 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3410 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
3411 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3412 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3414 /* Next add any whitespace glyphs in the outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3415 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3416 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3417 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
3418 GL_WHITESPACE, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3419 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3420 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3421 end_xpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3423 /* Next add any inside margin glyphs in the outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3424 if (in_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3425 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3426 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3427 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3428 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3430 /* There may be space between any whitespace or inside margin glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3431 in the outside margin and the actual outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3432 if (odb && (out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3433 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3434 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3435 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3436 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3437
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3438 /* Finally, add the outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3439 if (out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3440 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3441 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3442 RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3443 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3444 }
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 /* modeline routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3450 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3451 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3453 /* Ensure that the given display line DL accurately represents the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3454 modeline for the given window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3455
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3456 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3457 generate_modeline (struct window *w, struct display_line *dl, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3458 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3459 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3460 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3461 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3463 /* Unlike display line and rune pointers, this one can't change underneath
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3464 our feet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3465 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3466 int max_pixpos, min_pixpos, ypos_adj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3467 Lisp_Object font_inst;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3468
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3469 /* This will actually determine incorrect inside boundaries for the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3470 modeline since it ignores the margins. However being aware of this fact
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3471 we never use those values anywhere so it doesn't matter. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3472 dl->bounds = calculate_display_line_boundaries (w, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3474 /* We are generating a modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3475 dl->modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3476 dl->cursor_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3477
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3478 /* Reset the runes on the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3479 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3480
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3481 if (!WINDOW_HAS_MODELINE_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3482 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3483 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3484
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3485 /* If there is a horizontal scrollbar, don't add anything. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3486 if (window_scrollbar_height (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3487 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3488
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3489 dl->ascent = DEVMETH (d, divider_height, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3490 dl->descent = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3491 /* The modeline is at the bottom of the gutters. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3492 dl->ypos = WINDOW_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3493
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3494 rb.findex = MODELINE_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3495 rb.xpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3496 rb.width = dl->bounds.right_out - dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3497 rb.bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3498 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3499 rb.type = RUNE_HLINE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3500 rb.object.hline.thickness = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3501 rb.object.hline.yoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3502 rb.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3504 if (!EQ (Qzero, w->modeline_shadow_thickness)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3505 && FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3506 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3507 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3508
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3509 dl->ypos -= shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3510 rb.xpos += shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3511 rb.width -= 2 * shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3512 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3514 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3515 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3516 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3517
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3518 /* !!#### not right; needs to compute the max height of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3519 all the charsets */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3520 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3521
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3522 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3523 dl->descent = XFONT_INSTANCE (font_inst)->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3524
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3525 min_pixpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3526 max_pixpos = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3527
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3528 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3529 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3530 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3532 ypos_adj = shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3533 min_pixpos += shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3534 max_pixpos -= shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3535 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3536 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3537 ypos_adj = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3538
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3539 generate_formatted_string_db (b->modeline_format,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3540 b->generated_modeline_string, w, dl, db,
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
3541 MODELINE_INDEX, min_pixpos, max_pixpos, type);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3542
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3543 /* The modeline is at the bottom of the gutters. We have to wait to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3544 set this until we've generated teh modeline in order to account
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3545 for any embedded faces. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3546 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3547 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3548
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3549 static void
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3550 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3551 struct window *w, struct display_line *dl,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3552 struct display_block *db, face_index findex,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3553 int min_pixpos, int max_pixpos, int type)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3554 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3555 struct frame *f = XFRAME (w->frame);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3556 struct device *d = XDEVICE (f->device);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3557
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3558 pos_data data;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3559 int c_pixpos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3560
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
3561 xzero (data);
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3562 data.d = d;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3563 data.db = db;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3564 data.dl = dl;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3565 data.findex = findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3566 data.pixpos = min_pixpos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3567 data.max_pixpos = max_pixpos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3568 data.cursor_type = NO_CURSOR;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3569 data.last_charset = Qunbound;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3570 data.last_findex = DEFAULT_INDEX;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3571 data.result_str = result_str;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3572 data.is_modeline = 1;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3573 XSETWINDOW (data.window, w);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3574
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3575 Dynarr_reset (formatted_string_extent_dynarr);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3576 Dynarr_reset (formatted_string_extent_start_dynarr);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3577 Dynarr_reset (formatted_string_extent_end_dynarr);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3578
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3579 /* This recursively builds up the modeline. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3580 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3581 max_pixpos - min_pixpos, findex, type);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3582
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3583 if (Dynarr_length (db->runes))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3584 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3585 struct rune *rb =
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3586 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3587 c_pixpos = rb->xpos + rb->width;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3588 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3589 else
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3590 c_pixpos = min_pixpos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3591
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3592 /* If we don't reach the right side of the window, add a blank rune
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3593 to make up the difference. This usually only occurs if the
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3594 modeline face is using a proportional width font or a fixed width
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3595 font of a different size from the default face font. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3596
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3597 if (c_pixpos < max_pixpos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3598 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3599 data.pixpos = c_pixpos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3600 data.blank_width = max_pixpos - data.pixpos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3601
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3602 add_blank_rune (&data, NULL, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3603 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3604
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3605 /* Now create the result string and frob the extents into it. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3606 if (!NILP (result_str))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3607 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3608 int elt;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3609 Bytecount len;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3610 Bufbyte *strdata;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3611 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3612
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3613 detach_all_extents (result_str);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3614 resize_string (XSTRING (result_str), -1,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3615 data.bytepos - XSTRING_LENGTH (result_str));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3616
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3617 strdata = XSTRING_DATA (result_str);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3618
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3619 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3620 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3621 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3622 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3623 len += (set_charptr_emchar
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3624 (strdata + len, Dynarr_atp (db->runes,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3625 elt)->object.chr.ch));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3626 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3627 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3628
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3629 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3630 elt++)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3631 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3632 Lisp_Object extent = Qnil;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3633 Lisp_Object child;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3634
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3635 XSETEXTENT (extent, Dynarr_at (formatted_string_extent_dynarr, elt));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3636 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3637 if (NILP (child))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3638 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3639 child = Fmake_extent (Qnil, Qnil, result_str);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3640 Fputhash (extent, child, buf->modeline_extent_table);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3641 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3642 Fset_extent_parent (child, extent);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3643 set_extent_endpoints
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3644 (XEXTENT (child),
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3645 Dynarr_at (formatted_string_extent_start_dynarr, elt),
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3646 Dynarr_at (formatted_string_extent_end_dynarr, elt),
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3647 result_str);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3648 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3649 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3650 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3651
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3652 static Charcount
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3653 add_string_to_fstring_db_runes (pos_data *data, CONST Bufbyte *str,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3654 Charcount pos, Charcount min_pos, Charcount max_pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3655 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3656 /* This function has been Mule-ized. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3657 Charcount end;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3658 CONST Bufbyte *cur_pos = str;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3659 struct display_block *db = data->db;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3660
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3661 data->blank_width = space_width (XWINDOW (data->window));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3662 while (Dynarr_length (db->runes) < pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3663 add_blank_rune (data, NULL, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3664
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3665 end = (Dynarr_length (db->runes) +
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3666 bytecount_to_charcount (str, strlen ((CONST char *) str)));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3667 if (max_pos != -1)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3668 end = min (max_pos, end);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3669
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3670 while (pos < end && *cur_pos)
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 CONST Bufbyte *old_cur_pos = cur_pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3673 int succeeded;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3674
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3675 data->ch = charptr_emchar (cur_pos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3676 succeeded = (add_emchar_rune (data) != ADD_FAILED);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3677 INC_CHARPTR (cur_pos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3678 if (succeeded)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3679 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3680 pos++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3681 data->modeline_charpos++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3682 data->bytepos += cur_pos - old_cur_pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3683 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3684 }
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 while (Dynarr_length (db->runes) < min_pos &&
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3687 (data->pixpos + data->blank_width <= data->max_pixpos))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3688 add_blank_rune (data, NULL, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3689
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3690 return Dynarr_length (db->runes);
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
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3693 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3694 modeline extents. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3695 static Charcount
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3696 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3697 Charcount pos, Charcount min_pos, Charcount max_pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3698 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3699 /* This function has been Mule-ized. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3700 Charcount end;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3701 struct display_block *db = data->db;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3702 struct glyph_block gb;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3703
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3704 data->blank_width = space_width (XWINDOW (data->window));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3705 while (Dynarr_length (db->runes) < pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3706 add_blank_rune (data, NULL, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3707
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3708 end = Dynarr_length (db->runes) + 1;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3709 if (max_pos != -1)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3710 end = min (max_pos, end);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3711
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3712 gb.glyph = glyph;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3713 gb.extent = Qnil;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3714 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3715 pos++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3716
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3717 while (Dynarr_length (db->runes) < pos &&
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3718 (data->pixpos + data->blank_width <= data->max_pixpos))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3719 add_blank_rune (data, NULL, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3720
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3721 return Dynarr_length (db->runes);
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
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3724 /* 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
3725 true of max_pixsize. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3726 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3727 if (Dynarr_length (data->db->runes)) \
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3728 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3729 else \
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3730 cur_pixsize = 0;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3731
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3732 /* Note that this function does "positions" in terms of characters and
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3733 not in terms of columns. This is necessary to make the formatting
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3734 work correctly when proportional width fonts are used in the
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3735 modeline. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3736 static Charcount
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3737 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3738 Charcount min_pos, Charcount max_pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3739 Lisp_Object elt, int depth, int max_pixsize,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3740 face_index findex, int type)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3741 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3742 /* This function has been Mule-ized. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3743 /* #### The other losing things in this function are:
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3744
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3745 -- C zero-terminated-string lossage.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3746 -- Non-printable characters should be converted into something
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3747 appropriate (e.g. ^F) instead of blindly being printed anyway.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3748 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3749
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3750 tail_recurse:
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3751 if (depth > 10)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3752 goto invalid;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3753
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3754 depth++;
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 if (STRINGP (elt))
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 /* A string. Add to the display line and check for %-constructs
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3759 within it. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3760
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3761 Bufbyte *this = XSTRING_DATA (elt);
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 while ((pos < max_pos || max_pos == -1) && *this)
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 Bufbyte *last = 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 while (*this && *this != '%')
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3768 this++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3769
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3770 if (this != last)
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 /* The string is just a string. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3773 Charcount size =
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3774 bytecount_to_charcount (last, this - last) + pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3775 Charcount tmp_max = (max_pos == -1 ? size : min (size, max_pos));
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3776
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3777 pos = add_string_to_fstring_db_runes (data, last, pos, pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3778 tmp_max);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3779 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3780 else /* *this == '%' */
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 Charcount spec_width = 0;
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 this++; /* skip over '%' */
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 /* We can't allow -ve args due to the "%-" construct.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3787 * Argument specifies minwidth but not maxwidth
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3788 * (maxwidth can be specified by
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3789 * (<negative-number> . <stuff>) modeline elements)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3790 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3791 while (isdigit (*this))
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 spec_width = spec_width * 10 + (*this - '0');
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3794 this++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3795 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3796 spec_width += pos;
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 if (*this == 'M')
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 pos = generate_fstring_runes (w, data, pos, spec_width,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3801 max_pos, Vglobal_mode_string,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3802 depth, max_pixsize, findex,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3803 type);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3804 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3805 else if (*this == '-')
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 Charcount num_to_add;
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 if (max_pixsize < 0)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3810 num_to_add = 0;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3811 else if (max_pos != -1)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3812 num_to_add = max_pos - pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3813 else
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3814 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3815 int cur_pixsize;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3816 int dash_pixsize;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3817 Bufbyte ch = '-';
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3818 SET_CURRENT_MODE_CHARS_PIXSIZE;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3819
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3820 dash_pixsize =
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3821 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3822 1);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3823
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3824 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3825 num_to_add++;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3826 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3827
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3828 while (num_to_add--)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3829 pos = add_string_to_fstring_db_runes
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3830 (data, (CONST Bufbyte *) "-", pos, pos, max_pos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3831 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3832 else if (*this != 0)
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 Bufbyte *str;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3835 Emchar ch = charptr_emchar (this);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3836 decode_mode_spec (w, ch, type);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3837
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3838 str = Dynarr_atp (mode_spec_bufbyte_string, 0);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3839 pos = add_string_to_fstring_db_runes (data,str, pos, pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3840 max_pos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3841 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3842
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3843 /* NOT this++. There could be any sort of character at
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3844 the current position. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3845 INC_CHARPTR (this);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3846 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3847
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3848 if (max_pixsize > 0)
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 int cur_pixsize;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3851 SET_CURRENT_MODE_CHARS_PIXSIZE;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3852
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3853 if (cur_pixsize >= max_pixsize)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3854 break;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3855 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3856 }
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 else if (SYMBOLP (elt))
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 /* A symbol: process the value of the symbol recursively
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3861 as if it appeared here directly. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3862 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3863
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3864 if (!UNBOUNDP (tem))
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 value is a string, output that string literally:
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3867 don't check for % within it. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3868 if (STRINGP (tem))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3869 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3870 pos =
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3871 add_string_to_fstring_db_runes
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3872 (data, XSTRING_DATA (tem), pos, min_pos, max_pos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3873 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3874 /* Give up right away for nil or t. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3875 else if (!EQ (tem, elt))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3876 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3877 elt = tem;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3878 goto tail_recurse;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3879 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3880 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3881 }
274
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3882 else if (GENERIC_SPECIFIERP (elt))
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3883 {
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3884 Lisp_Object window, tem;
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3885 XSETWINDOW (window, w);
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3886 tem = specifier_instance_no_quit (elt, Qunbound, window,
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3887 ERROR_ME_NOT, 0, Qzero);
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3888 if (!UNBOUNDP (tem))
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3889 {
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3890 elt = tem;
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3891 goto tail_recurse;
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3892 }
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
3893 }
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3894 else if (CONSP (elt))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3895 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3896 /* A cons cell: four distinct cases.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3897 * If first element is a string or a cons, process all the elements
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3898 * and effectively concatenate them.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3899 * If first element is a negative number, truncate displaying cdr to
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3900 * at most that many characters. If positive, pad (with spaces)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3901 * to at least that many characters.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3902 * If first element is a symbol, process the cadr or caddr recursively
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3903 * according to whether the symbol's value is non-nil or nil.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3904 * If first element is a face, process the cdr recursively
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3905 * without altering the depth.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3906 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3907 Lisp_Object car, tem;
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 car = XCAR (elt);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3910 if (SYMBOLP (car))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3911 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3912 elt = XCDR (elt);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3913 if (!CONSP (elt))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3914 goto invalid;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3915 tem = symbol_value_in_buffer (car, w->buffer);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3916 /* elt is now the cdr, and we know it is a cons cell.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3917 Use its car if CAR has a non-nil value. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3918 if (!UNBOUNDP (tem))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3919 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3920 if (!NILP (tem))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3921 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3922 elt = XCAR (elt);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3923 goto tail_recurse;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3924 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3925 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3926 /* Symbol's value is nil (or symbol is unbound)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3927 * Get the cddr of the original list
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3928 * and if possible find the caddr and use that.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3929 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3930 elt = XCDR (elt);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3931 if (NILP (elt))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3932 ;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3933 else if (!CONSP (elt))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3934 goto invalid;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3935 else
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3936 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3937 elt = XCAR (elt);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3938 goto tail_recurse;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3939 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3940 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3941 else if (INTP (car))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3942 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3943 Charcount lim = XINT (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 elt = XCDR (elt);
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 if (lim < 0)
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 /* Negative int means reduce maximum width.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3950 * DO NOT change MIN_PIXPOS here!
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3951 * (20 -10 . foo) should truncate foo to 10 col
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3952 * and then pad to 20.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3953 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3954 if (max_pos == -1)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3955 max_pos = pos - lim;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3956 else
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3957 max_pos = min (max_pos, pos - lim);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3958 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3959 else if (lim > 0)
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 /* Padding specified. Don't let it be more than
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3962 * current maximum.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3963 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3964 lim += pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3965 if (max_pos != -1 && lim > max_pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3966 lim = max_pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3967 /* If that's more padding than already wanted, queue it.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3968 * But don't reduce padding already specified even if
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3969 * that is beyond the current truncation point.
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3970 */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3971 if (lim > min_pos)
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3972 min_pos = lim;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3973 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3974 goto tail_recurse;
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 else if (STRINGP (car) || CONSP (car))
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 int limit = 50;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3979 /* LIMIT is to protect against circular lists. */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3980 while (CONSP (elt) && --limit > 0
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3981 && (pos < max_pos || max_pos == -1))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3982 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3983 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3984 XCAR (elt), depth,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3985 max_pixsize, findex, type);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3986 elt = XCDR (elt);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3987 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3988 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3989 else if (EXTENTP (car))
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 struct extent *ext = XEXTENT (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 if (EXTENT_LIVE_P (ext))
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 face_index old_findex = data->findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3996 Lisp_Object face;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3997 Lisp_Object font_inst;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3998 face_index new_findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
3999 Bytecount start = data->bytepos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4000
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4001 face = extent_face (ext);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4002 if (FACEP (face))
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4003 {
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4004 /* #### needs to merge faces, sigh */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4005 /* #### needs to handle list of faces */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4006 new_findex = get_builtin_face_cache_index (w, face);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4007 /* !!#### not right; needs to compute the max height of
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4008 all the charsets */
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4009 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4010 Vcharset_ascii);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4011
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4012 data->dl->ascent = max (data->dl->ascent,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4013 XFONT_INSTANCE (font_inst)->ascent);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4014 data->dl->descent = max (data->dl->descent,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4015 XFONT_INSTANCE (font_inst)->
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4016 descent);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4017 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4018 else
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4019 new_findex = old_findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4020
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4021 data->findex = new_findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4022 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4023 XCDR (elt), depth - 1,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4024 max_pixsize, new_findex, type);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4025 data->findex = old_findex;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4026 Dynarr_add (formatted_string_extent_dynarr, ext);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4027 Dynarr_add (formatted_string_extent_start_dynarr, start);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4028 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4029 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4030 }
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 else if (GLYPHP (elt))
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 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4035 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4036 else
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 invalid:
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4039 pos =
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4040 add_string_to_fstring_db_runes
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4041 (data, (CONST Bufbyte *) GETTEXT ("*invalid*"), pos, min_pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4042 max_pos);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4043 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4044
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4045 if (min_pos > pos)
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 add_string_to_fstring_db_runes (data, (CONST Bufbyte *) "", pos, min_pos,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4048 -1);
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4049 }
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4050
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4051 return pos;
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4052 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4053
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4054 /* The caller is responsible for freeing the returned string. */
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4055 Bufbyte *
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4056 generate_formatted_string (struct window *w, Lisp_Object format_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4057 Lisp_Object result_str, face_index findex, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4058 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4059 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4060 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4061 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4062
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4063 dl = &formatted_string_display_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4064 db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4065 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4066
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4067 generate_formatted_string_db (format_str, result_str, w, dl, db, findex, 0,
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
4068 -1, type);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4069
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4070 Dynarr_reset (formatted_string_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4071 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4072 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4073 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4074 Dynarr_add (formatted_string_emchar_dynarr,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4075 Dynarr_atp (db->runes, elt)->object.chr.ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4076 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4077 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4078
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4079 return
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4080 convert_emchar_string_into_malloced_string
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4081 ( Dynarr_atp (formatted_string_emchar_dynarr, 0),
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4082 Dynarr_length (formatted_string_emchar_dynarr), 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4083 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4084
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4085 /* Update just the modeline. Assumes the desired display structs. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4086 they do not have a modeline block, it does nothing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4087 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4088 regenerate_modeline (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4089 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4090 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4091
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4092 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4093 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4094 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4095 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4096 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4097 redisplay_update_line (w, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4098 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4099 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4101 /* Make sure that modeline display line is present in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4102 display structs if the window has a modeline and update that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4103 line. Returns true if a modeline was needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4104 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4105 ensure_modeline_generated (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4106 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4107 int need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4108
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4109 /* minibuffer windows don't have modelines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4110 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4111 need_modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4112 /* windows which haven't had it turned off do */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4113 else if (WINDOW_HAS_MODELINE_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4114 need_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4115 /* 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
4116 a horizontal scrollbar */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4117 else if (window_scrollbar_height (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4118 need_modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4119 /* and in this case there is none */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4120 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4121 need_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4122
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4123 if (need_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4124 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4125 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4126
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4127 dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4129 /* We don't care if there is a display line which is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4130 currently a modeline because it is definitely going to become
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4131 one if we have gotten to this point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4132 if (Dynarr_length (dla) == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4133 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4134 if (Dynarr_largest (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 struct display_line *mlp = Dynarr_atp (dla, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4137 Dynarr_add (dla, *mlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4138 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4139 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4140 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4141 struct display_line modeline;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
4142 xzero (modeline);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4143 Dynarr_add (dla, modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4144 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4145 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4146
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4147 /* If we're adding a new place marker go ahead and generate the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4148 modeline so that it is available for use by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4149 window_modeline_height. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4150 generate_modeline (w, Dynarr_atp (dla, 0), type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4151 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4153 return need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4154 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4156 /* #### Kludge or not a kludge. I tend towards the former. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4157 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4158 real_current_modeline_height (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4159 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4160 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
4161 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4163 if (ensure_modeline_generated (w, CMOTION_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4164 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4165 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4167 if (Dynarr_length (dla))
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_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4170 return (Dynarr_atp (dla, 0)->ascent +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4171 Dynarr_atp (dla, 0)->descent);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4172 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4173 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4174 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4175 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4176
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 /* window-regeneration routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4181 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4182 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4183
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4184 /* For a given window and starting position in the buffer it contains,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4185 ensure that the TYPE display lines accurately represent the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4186 presentation of the window. We pass the buffer instead of getting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4187 it from the window since redisplay_window may have temporarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4188 changed it to the echo area buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4190 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4191 regenerate_window (struct window *w, Bufpos start_pos, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4192 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4193 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4194 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4195 int ypos = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4196 int yend; /* set farther down */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4197
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4198 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4199 layout_bounds bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4200 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4201 int need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4202
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4203 /* The lines had better exist by this point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4204 if (!(dla = window_display_lines (w, type)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4205 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4206 Dynarr_reset (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4207 w->max_line_len = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4208
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4209 /* Normally these get updated in redisplay_window but it is possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4210 for this function to get called from some other points where that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4211 update may not have occurred. This acts as a safety check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4212 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4213 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4214 if (!Dynarr_length (w->glyph_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4215 reset_glyph_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4216
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4217 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4218 Fset_marker (w->pointm[type], make_int (point), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4219 w->last_point_x[type] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4220 w->last_point_y[type] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4222 /* Make sure a modeline is in the structs if needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4223 need_modeline = ensure_modeline_generated (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4225 /* Wait until here to set this so that the structs have a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4226 generated in the case where one didn't exist. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4227 yend = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4228
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4229 bounds = calculate_display_line_boundaries (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4230
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4231 /* 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
4232 if (MINI_WINDOW_P (w)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4233 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4234 && !echo_area_active (f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4235 && start_pos == BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4236 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4237 struct prop_block pb;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4238 Lisp_Object string;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4239 prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4240
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4241 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4242 pb.type = PROP_MINIBUF_PROMPT;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4243 pb.data.p_string.str = XSTRING_DATA(string);
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4244 pb.data.p_string.len = XSTRING_LENGTH(string);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4245 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4246 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4247 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4248 prop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4249
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
4250 /* Make sure this is set always */
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
4251 /* Note the conversion at end */
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
4252 w->window_end_pos[type] = start_pos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4253 while (ypos < yend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4254 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4255 struct display_line dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4256 struct display_line *dlp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4257 int local;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4259 if (Dynarr_length (dla) < Dynarr_largest (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4260 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4261 dlp = Dynarr_atp (dla, Dynarr_length (dla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4262 local = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4263 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4264 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4265 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
4266 xzero (dl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4267 dlp = &dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4268 local = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4269 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4270
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4271 dlp->bounds = bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4272 dlp->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4273 start_pos = generate_display_line (w, dlp, 1, start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4274 w->hscroll, &prop, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4275 dlp->ypos = ypos + dlp->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4276 ypos = dlp->ypos + dlp->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4278 if (ypos > yend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4279 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4280 int visible_height = dlp->ascent + dlp->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4281
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4282 dlp->clip = (ypos - yend);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4283 visible_height -= dlp->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4284
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4285 if (visible_height < VERTICAL_CLIP (w, 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4286 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4287 if (local)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4288 free_display_line (dlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4289 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4290 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4291 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4292 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4293 dlp->clip = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4295 if (dlp->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4296 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4297 /* #### This check is steaming crap. Have to get things
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4298 fixed so when create_text_block hits EOB, we're done,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4299 period. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4300 if (w->last_point_x[type] == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4301 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4302 w->last_point_x[type] = dlp->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4303 w->last_point_y[type] = Dynarr_length (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4304 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4305 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4306 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4307 /* #### This means that we've added a cursor at EOB
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4308 twice. Yuck oh yuck. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4309 struct display_block *db =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4310 get_display_block_from_line (dlp, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4311
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4312 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4313 dlp->cursor_elt = -1;
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4317 if (dlp->num_chars > w->max_line_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4318 w->max_line_len = dlp->num_chars;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4319
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4320 Dynarr_add (dla, *dlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4321
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4322 /* #### This isn't right, but it is close enough for now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4323 w->window_end_pos[type] = start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4324
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4325 /* #### This type of check needs to be done down in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4326 generate_display_line call. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4327 if (start_pos > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4328 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4329 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4330
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4331 if (prop)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4332 Dynarr_free (prop);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4333
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4334 /* #### More not quite right, but close enough. */
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
4335 /* Ben sez: apparently window_end_pos[] is measured
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4336 as the number of characters between the window end and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4337 end of the buffer? This seems rather weirdo. What's
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
4338 the justification for this?
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
4339
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
4340 JV sez: Because BUF_Z (b) would be a good initial value, however
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
4341 that can change. This representation allows initalizing with 0.
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
4342 */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4343 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4344
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4345 if (need_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4346 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4347 /* 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
4348 there when we first started working in this function. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4349 generate_modeline (w, Dynarr_atp (dla, 0), type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4350 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4351 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4352
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4353 #define REGEN_INC_FIND_START_END \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4354 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4355 /* Determine start and end of lines. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4356 if (!Dynarr_length (cdla)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4357 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4358 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4359 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4360 if (Dynarr_atp (cdla, 0)->modeline && 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 = 1; \
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 if (!Dynarr_atp (cdla, 0)->modeline \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4365 && !Dynarr_atp (ddla, 0)->modeline) \
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_start = 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4368 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4369 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4370 abort (); /* structs differ */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4371 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4372 dla_end = Dynarr_length (cdla) - 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4373 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4374 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4375 start_pos = (Dynarr_atp (cdla, dla_start)->bufpos \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4376 + Dynarr_atp (cdla, dla_start)->offset); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4377 /* 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
4378 full regen. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4379 if (startp != start_pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4380 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4381 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4382 /* Point is outside the visible region so give up. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4383 if (pointm < start_pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4384 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4385 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4386 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4387
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4388 /* This attempts to incrementally update the display structures. It
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4389 returns a boolean indicating success or failure. This function is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4390 very similar to regenerate_window_incrementally and is in fact only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4391 called from that function. However, because of the nature of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4392 changes it deals with it sometimes makes different assumptions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4393 which can lead to success which are much more difficult to make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4394 when dealing with buffer changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4395
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4396 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4397 regenerate_window_extents_only_changed (struct window *w, Bufpos startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4398 Bufpos pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4399 Charcount beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4400 Charcount end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4401 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4402 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4403 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4404 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4406 int dla_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4407 int dla_end, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4408 int first_line, last_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4409 Bufpos start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4410 /* Don't define this in the loop where it is used because we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4411 definitely want its value to survive between passes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4412 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4414 /* 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
4415 been incremented, then fail. I'm not sure of the exact circumstances
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4416 under which this can happen, but I believe that it is probably a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4417 reasonable happening. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4418 if (!point_visible (w, pointm, CURRENT_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4419 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4420 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4421
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4422 /* 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
4423 go ahead and proceed with the optimization attempt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4424 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4425 || pointm != marker_position (w->last_point[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4426 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4427 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4428 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4429 struct frame *sel_f = device_selected_frame (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4430 int success = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4431
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4432 if (w->last_point_x[CURRENT_DISP] != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4433 && w->last_point_y[CURRENT_DISP] != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4434 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4435
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4436 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4437 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4438 /* Always regenerate the modeline in case it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4439 displaying the current line or column. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4440 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4441 success = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4442 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4443 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4444 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
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 (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4447 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4448 success = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4449 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4451 if (!success)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4452 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4453 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4454
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4455 if (beg_unchanged == -1 && end_unchanged == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4456 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4458 /* assert: There are no buffer modifications or they are all below the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4459 visible region. We assume that regenerate_window_incrementally has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4460 not called us unless this is true. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4462 REGEN_INC_FIND_START_END;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4463
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4464 /* If the changed are starts before the visible area, give up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4465 if (beg_unchanged < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4466 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4468 /* Find what display line the extent changes first affect. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4469 line = dla_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4470 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4471 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4472 struct display_line *dl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4473 Bufpos lstart = dl->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4474 Bufpos lend = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4475
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4476 if (beg_unchanged >= lstart && beg_unchanged <= lend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4477 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4479 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4480 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4481
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4482 /* If the changes are below the visible area then if point hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4483 moved return success otherwise fail in order to be safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4484 if (line > dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4485 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4486 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4487 && pointm == marker_position (w->last_point[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4488 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4489 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4490 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4491 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4492
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4493 /* At this point we know what line the changes first affect. We now
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4494 begin redrawing lines as long as we are still in the affected
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4495 region and the line's size and positioning don't change.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4496 Otherwise we fail. If we fail we will have altered the desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4497 structs which could lead to an assertion failure. However, if we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4498 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
4499 will actually end up being safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4500 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4501 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4502 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4503 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4504
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4505 first_line = last_line = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4506 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4507 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4508 Bufpos old_start, old_end, new_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4509 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4510 struct display_line *ddl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4511 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4512 int initial_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4514 assert (cdl->bufpos == ddl->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4515 assert (cdl->end_bufpos == ddl->end_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4516 assert (cdl->offset == 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 db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4519 initial_size = Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4520 old_start = ddl->bufpos + ddl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4521 old_end = ddl->end_bufpos + ddl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4523 /* If this is the first line being updated and it used
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4524 propagation data, fail. Otherwise we'll be okay because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4525 we'll have the necessary propagation data. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4526 if (line == first_line && ddl->used_prop_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4527 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4529 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4530 w->hscroll, &prop, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4531 ddl->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4532
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4533 /* #### If there is propagated stuff the fail. We could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4534 probably actually deal with this if the line had propagated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4535 information when originally created by a full
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4536 regeneration. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4537 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4538 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4539 Dynarr_free (prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4540 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4541 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4542
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4543 /* If any line position parameters have changed or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4544 cursor has disappeared or disappeared, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4545 db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4546 if (cdl->ypos != ddl->ypos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4547 || cdl->ascent != ddl->ascent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4548 || cdl->descent != ddl->descent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4549 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4550 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4551 || old_start != ddl->bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4552 || old_end != ddl->end_bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4553 || initial_size != Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4554 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4555 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4556 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4557
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4558 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4559 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4560 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4561 w->last_point_y[DESIRED_DISP] = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4562 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4564 last_line = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4566 /* If the extent changes end on the line we just updated then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4567 we're done. Otherwise go on to the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4568 if (end_unchanged <= ddl->end_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4569 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4570 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4571 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4572 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4573
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4574 redisplay_update_line (w, first_line, last_line, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4575 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4576 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4577
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4578 /* Attempt to update the display data structures based on knowledge of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4579 the changed region in the buffer. Returns a boolean indicating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4580 success or failure. If this function returns a failure then a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4581 regenerate_window _must_ be performed next in order to maintain
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4582 invariants located here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4584 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4585 regenerate_window_incrementally (struct window *w, Bufpos startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4586 Bufpos pointm)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4587 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4588 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4589 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4590 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4591 Charcount beg_unchanged, end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4592 Charcount extent_beg_unchanged, extent_end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4593
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4594 int dla_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4595 int dla_end, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4596 Bufpos start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4597
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4598 /* If this function is called, the current and desired structures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4599 had better be identical. If they are not, then that is a bug. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4600 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4601
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4602 /* We don't handle minibuffer windows yet. The minibuffer prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4603 screws us up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4604 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4605 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4607 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4608 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4609 ? -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4610 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4612 /* If nothing has changed in the buffer, then make sure point is ok
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4613 and succeed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4614 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4615 return regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4616 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4617 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4618
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4619 /* We can't deal with deleted newlines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4620 if (BUF_NEWLINE_WAS_DELETED (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4621 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4623 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4624 end_unchanged = (BUF_END_UNCHANGED (b) == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4625 ? -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4626 : BUF_Z (b) - BUF_END_UNCHANGED (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4628 REGEN_INC_FIND_START_END;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4630 /* If the changed area starts before the visible area, give up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4631 if (beg_unchanged < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4632 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4633
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4634 /* Find what display line the buffer changes first affect. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4635 line = dla_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4636 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4637 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4638 struct display_line *dl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4639 Bufpos lstart = dl->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4640 Bufpos lend = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4641
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4642 if (beg_unchanged >= lstart && beg_unchanged <= lend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4643 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4644
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4645 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4646 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4647
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4648 /* If the changes are below the visible area then if point hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4649 moved return success otherwise fail in order to be safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4650 if (line > dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4651 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4652 return regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4653 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4654 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4655 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4656 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4657 /* At this point we know what line the changes first affect. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4658 now redraw that line. If the changes are contained within it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4659 we are going to succeed and can update just that one line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4660 Otherwise we fail. If we fail we will have altered the desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4661 structs which could lead to an assertion failure. However, if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4662 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
4663 so we will actually end up being safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4664 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4665 Bufpos new_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4666 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4667 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4668 struct display_line *ddl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4670 assert (cdl->bufpos == ddl->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4671 assert (cdl->end_bufpos == ddl->end_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4672 assert (cdl->offset == ddl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4673
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4674 /* If the last rune is already a continuation glyph, fail.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4675 #### We should be able to handle this better. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4676 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4677 struct display_block *db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4678 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4679 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4680 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4681 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4682
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4683 if (rb->type == RUNE_DGLYPH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4684 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4685 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4686 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4687 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4689 /* If the line was generated using propagation data, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4690 if (ddl->used_prop_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4691 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4692
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4693 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4694 w->hscroll, &prop, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4695 ddl->offset = 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 /* If there is propagated stuff then it is pretty much a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4698 guarantee that more than just the one line is affected. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4699 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4700 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4701 Dynarr_free (prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4702 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4703 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4705 /* If the last rune is now a continuation glyph, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4706 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4707 struct display_block *db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4708 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4709 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4710 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4711 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4712
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4713 if (rb->type == RUNE_DGLYPH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4714 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4715 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4716 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4717 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4718
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4719 /* If any line position parameters have changed or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4720 cursor has disappeared or disappeared, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4721 if (cdl->ypos != ddl->ypos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4722 || cdl->ascent != ddl->ascent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4723 || cdl->descent != ddl->descent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4724 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4725 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4726 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4727 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4728 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4729
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4730 /* 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
4731 business. Update everything and return success. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4732 if (end_unchanged >= ddl->bufpos && end_unchanged <= ddl->end_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4733 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4734 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4735 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4736 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4737 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4738 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4739 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4741 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4742 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4743 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4744 w->last_point_y[DESIRED_DISP] = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4745 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4746
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4747 redisplay_update_line (w, line, line, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4748 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4750 /* #### For now we just flush the cache until this has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4751 tested. After that is done, this should correct the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4752 cache directly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4753 Dynarr_reset (w->line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4754
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4755 /* Adjust the extent changed boundaries to remove any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4756 overlap with the buffer changes since we've just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4757 successfully updated that area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4758 if (extent_beg_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4759 && extent_beg_unchanged >= beg_unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4760 && extent_beg_unchanged < end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4761 extent_beg_unchanged = end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4762
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4763 if (extent_end_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4764 && extent_end_unchanged >= beg_unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4765 && extent_end_unchanged < end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4766 extent_end_unchanged = beg_unchanged - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4767
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4768 if (extent_end_unchanged <= extent_beg_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4769 extent_beg_unchanged = extent_end_unchanged = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4771 /* This could lead to odd results if it fails, but since the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4772 buffer changes update succeeded this probably will to.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4773 We already know that the extent changes start at or after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4774 the line because we checked before entering the loop. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4775 if (extent_beg_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4776 && extent_end_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4777 && ((extent_beg_unchanged < ddl->bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4778 || (extent_end_unchanged > ddl->end_bufpos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4779 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4780 return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4781 regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4782 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4783 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4784 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4785 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4786 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4787 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4788 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4790 /* Oh, well. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4791 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4792 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4794 /* 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
4795 that point is displayed in the middle of the window.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4796 Return the window's new start position. */
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4797
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4798 static Bufpos
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4799 regenerate_window_point_center (struct window *w, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4800 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4801 Bufpos startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4802
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4803 /* We need to make sure that the modeline is generated so that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4804 window height can be calculated correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4805 ensure_modeline_generated (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4806
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4807 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4808 regenerate_window (w, startp, point, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4809 Fset_marker (w->start[type], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4810
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4811 return startp;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4812 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4814 /* Given a window and a set of display lines, return a boolean
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4815 indicating whether the given point is contained within. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4816
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4817 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4818 point_visible (struct window *w, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4819 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4820 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4821 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4822 int 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 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4825 first_line = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4826 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4827 first_line = 0;
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 (Dynarr_length (dla) > first_line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4830 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4831 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4832 struct display_line *dl = Dynarr_atp (dla, first_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4834 start = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4835 end = BUF_Z (b) - w->window_end_pos[type] - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4836
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4837 if (point >= start && point <= end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4838 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4839 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4840 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4841 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4842
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4843 if (point >= (dl->bufpos + dl->offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4844 && point <= (dl->end_bufpos + dl->offset))
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
4845 return !dl->clip;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4846 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4847 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4848 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4849 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4850 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4851 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4852 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4853 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4854 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4855 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4856 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4857 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4858
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4859 /* Return pixel position the middle of the window, not including the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4860 modeline and any potential horizontal scrollbar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4862 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4863 window_half_pixpos (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4864 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
4865 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4866 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4867
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4868 /* Return the display line which is currently in the middle of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4869 window W for display lines TYPE. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4871 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4872 line_at_center (struct window *w, int type, Bufpos start, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4873 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4874 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4875 int half;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4876 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4877 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4878
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4879 if (type == CMOTION_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4880 regenerate_window (w, start, point, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4881
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4882 dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4883 half = window_half_pixpos (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4884
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4885 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4886 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4887 struct display_line *dl = Dynarr_atp (dla, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4888 int line_bot = dl->ypos + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4889
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4890 if (line_bot > half)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4891 return elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4892 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4893
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4894 /* 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
4895 being displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4896 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4897 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4898
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4899 /* Return a value for point that would place it at the beginning of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4900 the line which is in the middle of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4901
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4902 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4903 point_at_center (struct window *w, int type, Bufpos start, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4904 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4905 /* line_at_center will regenerate the display structures, if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4906 int line = line_at_center (w, type, start, point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4907
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4908 if (line == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4909 return BUF_ZV (XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4910 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4911 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4912 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4913 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4914
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4915 return dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4916 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4917 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4918
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4919 /* For a given window, ensure that the current visual representation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4920 is accurate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4921
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4922 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4923 redisplay_window (Lisp_Object window, int skip_selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4924 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4925 struct window *w = XWINDOW (window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4926 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4927 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4928 Lisp_Object old_buffer = w->buffer;
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4929 Lisp_Object the_buffer = w->buffer;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4930 struct buffer *b;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4931 int echo_active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4932 int startp = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4933 int pointm;
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4934 int old_startp = 1;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4935 int old_pointm = 1;
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4936 int selected_in_its_frame;
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4937 int selected_globally;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4938 int skip_output = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4939 int truncation_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4940 int inactive_minibuffer =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4941 (MINI_WINDOW_P (w) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4942 (f != device_selected_frame (d)) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4943 !is_surrogate_for_selected_frame (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4944
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4945 /* #### In the new world this function actually does a bunch of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4946 optimizations such as buffer-based scrolling, but none of that is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4947 implemented yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4948
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4949 /* If this is a combination window, do its children; that's all.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4950 The selected window is always a leaf so we don't check for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4951 skip_selected here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4952 if (!NILP (w->vchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4953 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4954 redisplay_windows (w->vchild, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4955 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4956 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4957 if (!NILP (w->hchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4958 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4959 redisplay_windows (w->hchild, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4960 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4961 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4962
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4963 /* Is this window the selected window on its frame? */
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4964 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4965 selected_globally =
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4966 selected_in_its_frame &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4967 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4968 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4969 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4970 if (skip_selected && selected_in_its_frame)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4971 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4972
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4973 /* It is possible that the window is not fully initialized yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4974 if (NILP (w->buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4975 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4977 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4978 {
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4979 w->buffer = the_buffer = Vecho_area_buffer;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4980 echo_active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4981 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4982
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4983 b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4984
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4985 if (echo_active)
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4986 {
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4987 old_pointm = selected_globally
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4988 ? BUF_PT (b)
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4989 : marker_position (w->pointm[CURRENT_DISP]);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4990 pointm = 1;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
4991 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4992 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4993 {
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4994 if (selected_globally)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4995 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4996 pointm = BUF_PT (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4997 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4998 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4999 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5000 pointm = marker_position (w->pointm[CURRENT_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5002 if (pointm < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5003 pointm = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5004 else if (pointm > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5005 pointm = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5006 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5007 }
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5008 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5009
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5010 /* If the buffer has changed we have to invalid all of our face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5011 cache elements. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5012 if ((!echo_active && b != window_display_buffer (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5013 || !Dynarr_length (w->face_cachels)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5014 || f->faces_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5015 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5016 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5017 mark_face_cachels_as_not_updated (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5019 /* Ditto the glyph cache elements. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5020 if ((!echo_active && b != window_display_buffer (w))
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5021 || !Dynarr_length (w->glyph_cachels)
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5022 || f->glyphs_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5023 reset_glyph_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5024 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5025 mark_glyph_cachels_as_not_updated (w);
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 the marker's buffer is not the window's buffer, then we need
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5028 to find a new starting position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5029 if (!MINI_WINDOW_P (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5030 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5031 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5032 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5033
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5034 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5035 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5037 if (echo_active)
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5038 {
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5039 old_startp = marker_position (w->start[CURRENT_DISP]);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5040 startp = 1;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5041 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5042 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5043 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5044 startp = marker_position (w->start[CURRENT_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5045 if (startp < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5046 startp = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5047 else if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5048 startp = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5049 }
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5050 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5051
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5052 truncation_changed = (find_window_mirror (w)->truncate_win !=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5053 window_truncation_on (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5054
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5055 /* 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
5056 should display from there and change point, if necessary, to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5057 ensure that it is visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5058 if (w->force_start || inactive_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5059 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5060 w->force_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5061 w->last_modified[DESIRED_DISP] = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5062 w->last_facechange[DESIRED_DISP] = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5063
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5064 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5065
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5066 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5067 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5068 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5069
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5070 if (selected_globally)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5071 BUF_SET_PT (b, pointm);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5073 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5074 the_buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5075
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5076 /* #### BUFU amounts of overkil just to get the cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5077 location marked properly. FIX ME FIX ME FIX ME */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5078 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5079 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5080
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5081 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5082 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5084 /* If nothing has changed since the last redisplay, then we just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5085 need to make sure that point is still visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5086 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5087 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5088 && pointm >= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5089 /* This check is to make sure we restore the minibuffer after a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5090 temporary change to the echo area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5091 && !(MINI_WINDOW_P (w) && f->buffers_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5092 && !f->frame_changed
318
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents: 298
diff changeset
5093 && !truncation_changed
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents: 298
diff changeset
5094 /* check whether start is really at the begining of a line GE */
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents: 298
diff changeset
5095 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
afd57c14dfc8 Import from CVS: tag r21-0b57
cvs
parents: 298
diff changeset
5096 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5097 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5098 /* Check if the cursor has actually moved. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5099 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5100 && pointm == marker_position (w->last_point[CURRENT_DISP])
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5101 && selected_globally
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5102 && !w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5103 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5104 && !f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5105 && !f->faces_changed
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5106 && !f->glyphs_changed
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5107 && !f->point_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5108 && !f->windows_structure_changed)
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 not, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5111 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5112 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5113
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5114 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5115 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5116 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5117 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5118 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5119 /* If the new point is visible in the redisplay structures,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5120 then let the output update routines handle it, otherwise
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5121 do things the hard way. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5122 if (!w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5123 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5124 && !f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5125 && !f->faces_changed
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5126 && !f->glyphs_changed
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5127 && !f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5128 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5129 if (point_visible (w, pointm, CURRENT_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5130 && w->last_point_x[CURRENT_DISP] != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5131 && w->last_point_y[CURRENT_DISP] != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5132 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5133 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5134 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5135 /* Always regenerate in case it is displaying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5136 the current line or column. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5137 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5139 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5140 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5141 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5142 }
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5143 else if (!selected_in_its_frame && !f->point_changed)
0
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 (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5146 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5147
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5148 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5149 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5150 }
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 /* If we weren't able to take the shortcut method, then use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5154 the brute force method. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5155 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5156
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5157 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5158 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5159 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5160 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5162 /* Check if the starting point is no longer at the beginning of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5163 line, in which case find a new starting point. We also recenter
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5164 if our start position is equal to point-max. Otherwise we'll end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5165 up with a blank window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5166 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5167 && !(startp == BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5168 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5169 || (pointm == startp &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5170 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5171 startp < marker_position (w->last_start[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5172 || (startp == BUF_ZV (b)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5173 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5174 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5176 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5177 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5178 /* See if we can update the data structures locally based on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5179 knowledge of what changed in the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5180 else if (!w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5181 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5182 && !f->faces_changed
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5183 && !f->glyphs_changed
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5184 && !f->windows_structure_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5185 && !f->frame_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5186 && !truncation_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5187 && pointm >= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5188 && regenerate_window_incrementally (w, startp, pointm))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5189 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5190 if (f->modeline_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5191 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5192 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5193 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5195 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5196 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5197 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5198 /* #### This is where a check for structure based scrolling would go. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5199 /* If all else fails, try just regenerating and see what happens. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5200 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5201 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5202 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5204 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5205 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5206 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5208 /* We still haven't gotten the window regenerated with point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5209 visible. Next we try scrolling a little and see if point comes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5210 back onto the screen. */
274
ca9a9ec9c1c1 Import from CVS: tag r21-0b35
cvs
parents: 272
diff changeset
5211 if (scroll_step > 0)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5212 {
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5213 int scrolled = scroll_conservatively;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5214 for (; scrolled >= 0; scrolled -= scroll_step)
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5215 {
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5216 startp = vmotion (w, startp,
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5217 (pointm < startp) ? -scroll_step : scroll_step, 0);
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5218 regenerate_window (w, startp, pointm, DESIRED_DISP);
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5219
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5220 if (point_visible (w, pointm, DESIRED_DISP))
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5221 goto regeneration_done;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5222 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5223 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5225 /* We still haven't managed to get the screen drawn with point on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5226 the screen, so just center it and be done with it. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5227 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5228
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5230 regeneration_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5232 /* If the window's frame is changed then reset the current display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5233 lines in order to force a full repaint. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5234 if (f->frame_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5235 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5236 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5237
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5238 Dynarr_reset (cla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5239 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5240
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5241 /* Must do this before calling redisplay_output_window because it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5242 sets some markers on the window. */
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5243 if (echo_active)
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5244 {
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5245 w->buffer = old_buffer;
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5246 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5247 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5248 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5249
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5250 /* These also have to be set before calling redisplay_output_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5251 since it sets the CURRENT_DISP values based on them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5252 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5253 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5254 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5255 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5256
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5257 if (!skip_output)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5258 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5259 Bufpos start = marker_position (w->start[DESIRED_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5260 Bufpos end = (w->window_end_pos[DESIRED_DISP] == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5261 ? BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5262 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
343
8bec6624d99b Import from CVS: tag r21-1-1
cvs
parents: 318
diff changeset
5263 /* Don't pollute the cache if not sure if we are correct */
8bec6624d99b Import from CVS: tag r21-1-1
cvs
parents: 318
diff changeset
5264 if (w->start_at_line_beg)
8bec6624d99b Import from CVS: tag r21-1-1
cvs
parents: 318
diff changeset
5265 update_line_start_cache (w, start, end, pointm, 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5266 redisplay_output_window (w);
249
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5267 /*
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5268 * If we just displayed the echo area, the line start cache is
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5269 * no longer valid, because the minibuffer window is assocaited
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5270 * with the window now.
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5271 */
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5272 if (echo_active)
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 243
diff changeset
5273 w->line_cache_last_updated = make_int (-1);
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 /* #### This should be dependent on face changes and will need to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5277 somewhere else once tty updates occur on a per-frame basis. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5278 mark_face_cachels_as_clean (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5280 w->windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5281 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5282
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5283 /* Call buffer_reset_changes for all buffers present in any window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5284 currently visible in all frames on all devices. #### There has to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5285 be a better way to do this. */
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 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5288 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5289 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5290 buffer_reset_changes (XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5291 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5292 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5294 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5295 reset_buffer_changes (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5296 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5297 Lisp_Object frmcons, devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5299 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5300 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5301 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5302
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5303 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5304 map_windows (f, reset_buffer_changes_mapfun, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5305 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5306 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5307
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5308 /* Ensure that all windows underneath the given window in the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5309 hierarchy are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5310
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5311 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5312 redisplay_windows (Lisp_Object window, int skip_selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5313 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5314 for (; !NILP (window) ; window = XWINDOW (window)->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5315 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5316 redisplay_window (window, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5317 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5318 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5319
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5320 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5321 call_redisplay_end_triggers (struct window *w, void *closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5322 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5323 Bufpos lrpos = w->last_redisplay_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5324 w->last_redisplay_pos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5325 if (!NILP (w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5326 && !NILP (w->redisplay_end_trigger)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5327 && lrpos > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5328 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5329 Bufpos pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5330
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5331 if (MARKERP (w->redisplay_end_trigger)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5332 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5333 pos = marker_position (w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5334 else if (INTP (w->redisplay_end_trigger))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5335 pos = XINT (w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5336 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5337 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5338 w->redisplay_end_trigger = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5339 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5340 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5342 if (lrpos >= pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5343 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
5344 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5345 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5346 va_run_hook_with_args_in_buffer (XBUFFER (w->buffer),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5347 Qredisplay_end_trigger_functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5348 2, window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5349 w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5350 w->redisplay_end_trigger = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5351 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5352 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5354 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5355 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5356
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5357 /* Ensure that all windows on the given frame are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5358
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5359 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5360 redisplay_frame (struct frame *f, int preemption_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5361 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5362 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5363
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5364 if (preemption_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5365 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5366 /* The preemption check itself takes a lot of time,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5367 so normally don't do it here. We do it if called
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5368 from Lisp, though (`redisplay-frame'). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5369 int preempted;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5370
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5371 REDISPLAY_PREEMPTION_CHECK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5372 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5373 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5374 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5376 /* Before we put a hold on frame size changes, attempt to process
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5377 any which are already pending. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5378 if (f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5379 change_frame_size (f, f->new_height, f->new_width, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5380
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5381 /* If frame size might need to be changed, due to changed size
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5382 of toolbars, scroolabrs etc, change it now */
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5383 if (f->size_slipped)
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5384 {
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5385 adjust_frame_size (f);
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5386 assert (!f->size_slipped);
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5387 }
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5388
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5389 /* The menubar, toolbar, and icon updates must be done before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5390 hold_frame_size_changes is called and we are officially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5391 'in_display'. They may eval lisp code which may call Fsignal.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5392 If in_display is set Fsignal will abort. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5393
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5394 #ifdef HAVE_MENUBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5395 /* Update the menubar. It is done first since it could change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5396 the menubar's visibility. This way we avoid having flashing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5397 caused by an Expose event generated by the visibility change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5398 being handled. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5399 update_frame_menubars (f);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5400 #endif /* HAVE_MENUBARS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5401
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5402 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5403 /* Update the toolbars. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5404 update_frame_toolbars (f);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5405 #endif /* HAVE_TOOLBARS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5407 hold_frame_size_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5409 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5410 /* Within this section, we are defenseless and assume that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5411 following cannot happen:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5412
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5413 1) garbage collection
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5414 2) Lisp code evaluation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5415 3) frame size changes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5416
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5417 We ensure (3) by calling hold_frame_size_changes(), which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5418 will cause any pending frame size changes to get put on hold
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5419 till after the end of the critical section. (1) follows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5420 automatically if (2) is met. #### Unfortunately, there are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5421 some places where Lisp code can be called within this section.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5422 We need to remove them.
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 Fsignal() is called during this critical section, we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5425 will abort().
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 garbage collection is called during this critical section,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5428 we simply return. #### We should abort instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5430 #### If a frame-size change does occur we should probably
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5431 actually be preempting redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5432
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5433 /* If we clear the frame we have to force its contents to be redrawn. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5434 if (f->clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5435 f->frame_changed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5436
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5437 /* Erase the frame before outputting its contents. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5438 if (f->clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5439 DEVMETH (d, clear_frame, (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5441 /* Do the selected window first. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5442 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5444 /* Then do the rest. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5445 redisplay_windows (f->root_window, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5447 /* We now call the output_end routine for tty frames. We delay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5448 doing so in order to avoid cursor flicker. So much for 100%
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5449 encapsulation. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5450 if (FRAME_TTY_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5451 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5453 update_frame_title (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5454
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5455 f->buffers_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5456 f->clip_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5457 f->extents_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5458 f->faces_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5459 f->frame_changed = 0;
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5460 f->glyphs_changed = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5461 f->icon_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5462 f->menubar_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5463 f->modeline_changed = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5464 f->point_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5465 f->toolbar_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5466 f->windows_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5467 f->windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5468 f->window_face_cache_reset = 0;
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
5469 f->echo_area_garbaged = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5471 f->clear = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5472
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5473 if (!f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5474 f->size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5475
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5476 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5477
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5478 /* Allow frame size changes to occur again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5479
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5480 #### what happens if changes to other frames happen? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5481 unhold_one_frame_size_changes (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5482
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5483 map_windows (f, call_redisplay_end_triggers, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5484 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5485 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5486
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5487 /* Ensure that all frames on the given device are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5488
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5489 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5490 redisplay_device (struct device *d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5491 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5492 Lisp_Object frame, frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5493 int preempted = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5494 int size_change_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5495 struct frame *f;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5496
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5497 if (DEVICE_STREAM_P (d)) /* nothing to do */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5498 return 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 /* It is possible that redisplay has been called before the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5501 device is fully initialized. If so then continue with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5502 next device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5503 if (NILP (DEVICE_SELECTED_FRAME (d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5504 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5505
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5506 REDISPLAY_PREEMPTION_CHECK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5507 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5508 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5509
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5510 /* Always do the selected frame first. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5511 frame = DEVICE_SELECTED_FRAME (d);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5512
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5513 f = XFRAME (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5514
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5515 if (f->icon_changed || f->windows_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5516 update_frame_icon (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5517
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5518 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5519 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5520 if (f->buffers_changed || f->clip_changed || f->extents_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5521 f->faces_changed || f->frame_changed || f->menubar_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5522 f->modeline_changed || f->point_changed || f->size_changed ||
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5523 f->toolbar_changed || f->windows_changed || f->size_slipped ||
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5524 f->windows_structure_changed || f->glyphs_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5525 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5526 preempted = redisplay_frame (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5527 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5529 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5530 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5532 /* If the frame redisplay did not get preempted, then this flag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5533 should have gotten set to 0. It might be possible for that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5534 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
5535 time. To make sure we don't miss anything we simply don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5536 reset the top level flags until the condition ends up being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5537 in the right state. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5538 if (f->size_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5539 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5540 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5542 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5543 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5544 f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5546 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5547 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5549 if (f->icon_changed || f->windows_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5550 update_frame_icon (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5551
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5552 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5553 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5554 if (f->buffers_changed || f->clip_changed || f->extents_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5555 f->faces_changed || f->frame_changed || f->menubar_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5556 f->modeline_changed || f->point_changed || f->size_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5557 f->toolbar_changed || f->windows_changed ||
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5558 f->windows_structure_changed ||
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5559 f->glyphs_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5560 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5561 preempted = redisplay_frame (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5562 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5564 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5565 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5567 if (f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5568 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5569 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5570 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5571
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5572 /* If we get here then we redisplayed all of our frames without
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5573 getting preempted so mark ourselves as clean. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5574 d->buffers_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5575 d->clip_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5576 d->extents_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5577 d->faces_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5578 d->frame_changed = 0;
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5579 d->glyphs_changed = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5580 d->icon_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5581 d->menubar_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5582 d->modeline_changed = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5583 d->point_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5584 d->toolbar_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5585 d->windows_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5586 d->windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5587
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5588 if (!size_change_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5589 d->size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5590
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5591 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5592 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5593
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5594 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5595 restore_profiling_redisplay_flag (Lisp_Object val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5596 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5597 profiling_redisplay_flag = XINT (val);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5598 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5599 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5601 /* Ensure that all windows on all frames on all devices are displaying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5602 the current contents of their respective buffers. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5603
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5604 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5605 redisplay_without_hooks (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5606 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5607 Lisp_Object devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5608 int size_change_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5609 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5611 if (profiling_active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5612 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5613 record_unwind_protect (restore_profiling_redisplay_flag,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5614 make_int (profiling_redisplay_flag));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5615 profiling_redisplay_flag = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5616 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5618 if (asynch_device_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5619 handle_asynch_device_change ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5620
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5621 if (!buffers_changed && !clip_changed && !extents_changed &&
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5622 !faces_changed && !frame_changed && !icon_changed &&
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5623 !menubar_changed && !modeline_changed && !point_changed &&
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5624 !size_changed && !toolbar_changed && !windows_changed &&
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5625 !glyphs_changed &&
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5626 !windows_structure_changed && !disable_preemption &&
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5627 preemption_count < max_preempts)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5628 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5630 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5631 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5632 struct device *d = XDEVICE (XCAR (devcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5633 int preempted;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5634
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5635 if (d->buffers_changed || d->clip_changed || d->extents_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5636 d->faces_changed || d->frame_changed || d->icon_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5637 d->menubar_changed || d->modeline_changed || d->point_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5638 d->size_changed || d->toolbar_changed || d->windows_changed ||
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5639 d->windows_structure_changed ||
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5640 d->glyphs_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5641 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5642 preempted = redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5643
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5644 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5645 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5646 preemption_count++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5647 RESET_CHANGED_SET_FLAGS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5648 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5649 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5650
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5651 /* See comment in redisplay_device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5652 if (d->size_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5653 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5654 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5655 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5656 preemption_count = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5657
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5658 /* Mark redisplay as accurate */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5659 buffers_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5660 clip_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5661 extents_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5662 frame_changed = 0;
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
5663 glyphs_changed = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5664 icon_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5665 menubar_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5666 modeline_changed = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5667 point_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5668 toolbar_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5669 windows_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5670 windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5671 RESET_CHANGED_SET_FLAGS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5672
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5673 if (faces_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5674 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5675 mark_all_faces_as_clean ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5676 faces_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5677 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5678
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5679 if (!size_change_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5680 size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5681
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5682 reset_buffer_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5683
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5684 done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5685 unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5686 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5687
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5688 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5689 redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5690 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5691 if (last_display_warning_tick != display_warning_tick &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5692 !inhibit_warning_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5693 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5694 /* If an error occurs during this function, oh well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5695 If we report another warning, we could get stuck in an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5696 infinite loop reporting warnings. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5697 call0_trapping_errors (0, Qdisplay_warning_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5698 last_display_warning_tick = display_warning_tick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5699 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5700 /* The run_hook_trapping_errors functions are smart enough not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5701 to do any evalling if the hook function is empty, so there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5702 should not be any significant time loss. All places in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5703 C code that call redisplay() are prepared to handle GCing,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5704 so we should be OK. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5705 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5706 run_hook_trapping_errors ("Error in pre-redisplay-hook",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5707 Qpre_redisplay_hook);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5708 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5710 redisplay_without_hooks ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5711
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5712 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5713 run_hook_trapping_errors ("Error in post-redisplay-hook",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5714 Qpost_redisplay_hook);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5715 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5716 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5717
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5718
267
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
5719 static char window_line_number_buf[32];
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5720
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5721 /* Efficiently determine the window line number, and return a pointer
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5722 to its printed representation. Do this regardless of whether
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5723 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
5724 1. If narrowing is in effect, the lines are counted from the
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5725 beginning of the visible portion of the buffer. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5726 static char *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5727 window_line_number (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5728 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5729 struct device *d = XDEVICE (XFRAME (w->frame)->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5730 struct buffer *b = XBUFFER (w->buffer);
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5731 /* Be careful in the order of these tests. The first clasue will
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5732 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5733 This can occur when the frame title is computed really early */
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5734 Bufpos pos =
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5735 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5736 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5737 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5738 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5739 ? BUF_PT (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5740 : marker_position (w->pointm[type]));
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5741 EMACS_INT line;
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5742
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5743 line = buffer_line_number (b, pos, 1);
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5744
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5745 long_to_string (window_line_number_buf, line + 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5746
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
5747 return window_line_number_buf;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5748 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5749
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5750
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5751 /* Given a character representing an object in a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5752 specification, return a string (stored into the global array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5753 `mode_spec_bufbyte_string') with the information that object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5754 represents.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5755
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5756 This function is largely unchanged from previous versions of the
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5757 redisplay engine.
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5758
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5759 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
5760 very early in the device/frame update process! JV
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5761 */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5762
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5763 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5764 decode_mode_spec (struct window *w, Emchar spec, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5765 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5766 Lisp_Object obj = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5767 CONST char *str = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5768 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5769
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5770 Dynarr_reset (mode_spec_bufbyte_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5771
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5772 switch (spec)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5773 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5774 /* print buffer name */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5775 case 'b':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5776 obj = b->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5777 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5779 /* print visited file name */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5780 case 'f':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5781 obj = b->filename;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5782 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5783
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5784 /* print the current column */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5785 case 'c':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5786 {
298
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 294
diff changeset
5787 Bufpos pt = (w == XWINDOW (Fselected_window (Qnil)))
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 294
diff changeset
5788 ? BUF_PT (b)
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 294
diff changeset
5789 : marker_position (w->pointm[type]);
70ad99077275 Import from CVS: tag r21-0b47
cvs
parents: 294
diff changeset
5790 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
5791 char buf[32];
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
5792
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 274
diff changeset
5793 long_to_string (buf, col);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5794
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5795 Dynarr_add_many (mode_spec_bufbyte_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5796 (CONST Bufbyte *) buf, strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5797
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5798 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5799 }
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5800 /* print the file coding system */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5801 case 'C':
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
5802 #ifdef FILE_CODING
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5803 {
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
5804 Lisp_Object codesys = b->buffer_file_coding_system;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5805 /* Be very careful here not to get an error. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5806 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5807 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5808 codesys = Ffind_coding_system (codesys);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5809 if (CODING_SYSTEMP (codesys))
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
5810 obj = XCODING_SYSTEM_MNEMONIC (codesys);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5811 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5812 }
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
5813 #endif /* FILE_CODING */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5814 break;
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5815
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5816 /* print the current line number */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5817 case 'l':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5818 str = window_line_number (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5819 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5820
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5821 /* print value of mode-name (obsolete) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5822 case 'm':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5823 obj = b->mode_name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5824 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5825
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5826 /* print hyphen and frame number, if != 1 */
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5827 case 'N':
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5828 #ifdef HAVE_TTY
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5829 {
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5830 struct frame *f = XFRAME (w->frame);
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5831 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
5832 {
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
5833 /* Naughty, naughty */
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
5834 char * writable_str = alloca_array (char, 10);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
5835 sprintf (writable_str, "-%d", f->order_count);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
5836 str = writable_str;
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5837 }
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5838 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5839 #endif /* HAVE_TTY */
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5840 break;
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5841
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5842 /* print Narrow if appropriate */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5843 case 'n':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5844 if (BUF_BEGV (b) > BUF_BEG (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5845 || BUF_ZV (b) < BUF_Z (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5846 str = " Narrow";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5847 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5849 /* print %, * or hyphen, if buffer is read-only, modified or neither */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5850 case '*':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5851 str = (!NILP (b->read_only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5852 ? "%"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5853 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5854 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5855 : "-"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5856 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5858 /* print * or hyphen -- XEmacs change to allow a buffer to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5859 read-only but still indicate whether it is modified. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5860 case '+':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5861 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5862 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5863 : (!NILP (b->read_only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5864 ? "%"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5865 : "-"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5866 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5867
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5868 /* #### defined in 19.29 decode_mode_spec, but not in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5869 modeline-format doc string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5870 /* This differs from %* in that it ignores read-only-ness. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5871 case '&':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5872 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5873 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5874 : "-");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5875 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5876
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5877 /* print process status */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5878 case 's':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5879 obj = Fget_buffer_process (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5880 if (NILP (obj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5881 str = GETTEXT ("no process");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5882 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5883 obj = Fsymbol_name (Fprocess_status (obj));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5884 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5885
227
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 223
diff changeset
5886 /* Print name of selected frame. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5887 case 'S':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5888 obj = XFRAME (w->frame)->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5889 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5890
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5891 /* indicate TEXT or BINARY */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5892 case 't':
265
8efd647ea9ca Import from CVS: tag r20-5b31
cvs
parents: 259
diff changeset
5893 /* #### NT does not use this any more. Now what? */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5894 str = "T";
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5895 break;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5896
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5897 /* print percent of buffer above top of window, or Top, Bot or All */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5898 case 'p':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5899 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5900 Bufpos pos = marker_position (w->start[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5901 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5902
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5903 /* This had better be while the desired lines are being done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5904 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5905 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5906 if (pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5907 str = "All";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5908 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5909 str = "Bottom";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5910 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5911 else if (pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5912 str = "Top";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5913 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5914 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5915 /* This hard limit is ok since the string it will hold has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5916 fixed maximum length of 3. But just to be safe... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5917 char buf[10];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5918
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5919 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5920
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5921 /* We can't normally display a 3-digit number, so get us a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5922 2-digit number that is close. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5923 if (total == 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5924 total = 99;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5925
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5926 sprintf (buf, "%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5927 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5928 strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5929
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5930 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5931 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5932 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5933 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5934
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5935 /* print percent of buffer above bottom of window, perhaps plus
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5936 Top, or print Bottom or All */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5937 case 'P':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5938 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5939 Bufpos toppos = marker_position (w->start[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5940 Bufpos botpos = BUF_Z (b) - w->window_end_pos[type];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5941 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5942
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5943 /* 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
5944 only treat it as a hint. In particular, after erase-buffer,
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5945 botpos may be negative. */
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5946 if (botpos < toppos)
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5947 botpos = toppos;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5948
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5949 if (botpos >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5950 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5951 if (toppos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5952 str = "All";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5953 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5954 str = "Bottom";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5955 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5956 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5957 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5958 /* This hard limit is ok since the string it will hold has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5959 fixed maximum length of around 6. But just to be safe... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5960 char buf[10];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5962 total = ((botpos - BUF_BEGV (b)) * 100 + total - 1) / total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5964 /* We can't normally display a 3-digit number, so get us a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5965 2-digit number that is close. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5966 if (total == 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5967 total = 99;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5969 if (toppos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5970 sprintf (buf, "Top%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5971 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5972 sprintf (buf, "%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5973
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5974 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5975 strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5977 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5978 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5979 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5980 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5982 /* print % */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5983 case '%':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5984 str = "%";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5985 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5987 /* print one [ for each recursive editing level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5988 case '[':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5989 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5990 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5992 if (command_loop_level > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5993 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5994 str = "[[[... ";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5995 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5996 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5997
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5998 for (i = 0; i < command_loop_level; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5999 Dynarr_add (mode_spec_bufbyte_string, '[');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6001 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6002 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6003
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6004 /* print one ] for each recursive editing level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6005 case ']':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6006 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6007 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6008
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6009 if (command_loop_level > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6010 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6011 str = "...]]]";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6012 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6013 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6014
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6015 for (i = 0; i < command_loop_level; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6016 Dynarr_add (mode_spec_bufbyte_string, ']');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6017
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6018 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6019 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6020
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6021 /* print infinitely many dashes -- handle at top level now */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6022 case '-':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6023 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6024
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6025 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6026
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6027 if (STRINGP (obj))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
6028 Dynarr_add_many (mode_spec_bufbyte_string,
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
6029 XSTRING_DATA (obj),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
6030 XSTRING_LENGTH (obj));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6031 else if (str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6032 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) str, strlen (str));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6033
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6034 decode_mode_spec_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6035 Dynarr_add (mode_spec_bufbyte_string, '\0');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6036 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6037
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
6038 /* Given a display line, free all of its data structures. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6039
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6040 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6041 free_display_line (struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6042 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6043 int block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6044
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6045 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6046 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6047 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6048 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6049 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6050
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6051 Dynarr_free (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6052 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6053
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6054 Dynarr_free (dl->display_blocks);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6055 dl->display_blocks = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6056 }
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->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6059 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6060 Dynarr_free (dl->left_glyphs);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6061 dl->left_glyphs = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6062 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6063
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6064 if (dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6065 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6066 Dynarr_free (dl->right_glyphs);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6067 dl->right_glyphs = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6068 }
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6072 /* Given an array of display lines, free them and all data structures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6073 contained within them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6074
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6075 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6076 free_display_lines (display_line_dynarr *dla)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6077 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6078 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6079
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6080 for (line = 0; line < Dynarr_largest (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6081 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6082 free_display_line (Dynarr_atp (dla, line));
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 Dynarr_free (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6086 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6087
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6088 /* Call internal free routine for each set of display lines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6090 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6091 free_display_structs (struct window_mirror *mir)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6092 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6093 if (mir->current_display_lines)
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_lines (mir->current_display_lines);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6096 mir->current_display_lines = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6097 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6099 if (mir->desired_display_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6100 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6101 free_display_lines (mir->desired_display_lines);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6102 mir->desired_display_lines = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6103 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6104 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6107 static void
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6108 mark_glyph_block_dynarr (glyph_block_dynarr *gba, void (*markobj) (Lisp_Object))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6109 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6110 if (gba)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6111 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6112 glyph_block *gb = Dynarr_atp (gba, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6113 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6114
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6115 for (; gb < gb_last; gb++)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6116 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6117 if (!NILP (gb->glyph)) ((markobj) (gb->glyph));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6118 if (!NILP (gb->extent)) ((markobj) (gb->extent));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6119 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6120 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6121 }
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 static void
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6124 mark_redisplay_structs (display_line_dynarr *dla, void (*markobj) (Lisp_Object))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6125 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6126 display_line *dl = Dynarr_atp (dla, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6127 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6128
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6129 for (; dl < dl_last; dl++)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6130 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6131 display_block_dynarr *dba = dl->display_blocks;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6132 display_block *db = Dynarr_atp (dba, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6133 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
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 for (; db < db_last; db++)
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 rune_dynarr *ra = db->runes;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6138 rune *r = Dynarr_atp (ra, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6139 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6140
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6141 for (; r < r_last; r++)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6142 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6143 if (r->type == RUNE_DGLYPH)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6144 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6145 if (!NILP (r->object.dglyph.glyph))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6146 ((markobj) (r->object.dglyph.glyph));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6147 if (!NILP (r->object.dglyph.extent))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6148 ((markobj) (r->object.dglyph.extent));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6149 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6150 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6151 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6152
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6153 mark_glyph_block_dynarr (dl->left_glyphs, markobj);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6154 mark_glyph_block_dynarr (dl->right_glyphs, markobj);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6155 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6156 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6157
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6158 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6159 mark_window_mirror (struct window_mirror *mir, void (*markobj)(Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6160 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6161 mark_redisplay_structs (mir->current_display_lines, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6162 mark_redisplay_structs (mir->desired_display_lines, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6163
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6164 if (mir->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6165 mark_window_mirror (mir->next, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6167 if (mir->hchild)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6168 mark_window_mirror (mir->hchild, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6169 else if (mir->vchild)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6170 mark_window_mirror (mir->vchild, markobj);
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 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6174 mark_redisplay (void (*markobj)(Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6175 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6176 Lisp_Object frmcons, devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6177
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6178 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6179 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6180 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6181 update_frame_window_mirror (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6182 mark_window_mirror (f->root_mirror, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6183 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6184 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6186 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6187 Line Start Cache Description and Rationale
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6188
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6189 The traditional scrolling code in Emacs breaks in a variable height world.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6190 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
6191 displayed at any given time is fixed. This led to a complete separation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6192 of the scrolling code from the redisplay code. In order to fully support
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6193 variable height lines, the scrolling code must actually be tightly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6194 integrated with redisplay. Only redisplay can determine how many lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6195 will be displayed on a screen for any given starting point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6196
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6197 What is ideally wanted is a complete list of the starting buffer position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6198 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
6199 display line. Maintaining such a full list would be very expensive. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6200 settle for having it include information for all areas which we happen to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6201 generate anyhow (i.e. the region currently being displayed) and for those
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6202 areas we need to work with.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6204 In order to ensure that the cache accurately represents what redisplay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6205 would actually show, it is necessary to invalidate it in many situations.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6206 If the buffer changes, the starting positions may no longer be correct.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6207 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
6208 These events happen frequently enough that the cache can end up being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6209 constantly disabled. With this potentially constant invalidation when is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6210 the cache ever useful?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6211
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6212 Even if the cache is invalidated before every single usage, it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6213 necessary. Scrolling often requires knowledge about display lines which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6214 are actually above or below the visible region. The cache provides a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6215 convenient light-weight method of storing this information for multiple
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6216 display regions. This knowledge is necessary for the scrolling code to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6217 always obey the First Golden Rule of Redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6219 If the cache already contains all of the information that the scrolling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6220 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
6221 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
6222 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
6223 region had to be generated anyway, so the cache ends up getting the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6224 information basically for free. In those cases where a user is simply
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6225 scrolling around viewing a buffer there is a high probability that this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6226 sufficient to always provide the needed information. The second thing we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6227 can do is be smart about invalidating the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6228
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6229 TODO -- Be smart about invalidating the cache. Potential places:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6230
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6231 + 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
6232 starting positions of any display lines. These types of buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6233 modifications should not invalidate the cache. This is actually a large
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6234 optimization for redisplay speed as well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6235
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6236 + Buffer modifications frequently only affect the display of lines at and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6237 below where they occur. In these situations we should only invalidate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6238 the part of the cache starting at where the modification occurs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6239
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6240 In case you're wondering, the Second Golden Rule of Redisplay is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6241 applicable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6242 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6244 /* 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
6245 allocating and freeing it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6246 line_start_cache_dynarr *internal_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6248 /* Makes internal_cache represent the TYPE display structs and only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6249 the TYPE display structs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6251 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6252 update_internal_cache_list (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6253 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6254 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6255 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6256
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6257 Dynarr_reset (internal_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6258 for (line = 0; line < Dynarr_length (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6259 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6260 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6262 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6263 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6264 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6265 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6266 struct line_start_cache lsc;
343
8bec6624d99b Import from CVS: tag r21-1-1
cvs
parents: 318
diff changeset
6267
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6268 lsc.start = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6269 lsc.end = dl->end_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6270 lsc.height = dl->ascent + dl->descent;
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_add (internal_cache, lsc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6273 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6274 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6275 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6276
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6277 /* Reset the line cache if necessary. This should be run at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6278 beginning of any function which access the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6280 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6281 validate_line_start_cache (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6282 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6283 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6284 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6286 if (!w->line_cache_validation_override)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6287 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6288 /* f->extents_changed used to be in here because extent face and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6289 size changes can cause text shifting. However, the extent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6290 covering the region is constantly having its face set and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6291 priority altered by the mouse code. This means that the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6292 start cache is constanty being invalidated. This is bad
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6293 since the mouse code also triggers heavy usage of the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6294 Since it is an unlikely that f->extents being changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6295 indicates that the cache really needs to be updated and if it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6296 does redisplay will catch it pretty quickly we no longer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6297 invalidate the cache if it is set. This greatly speeds up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6298 dragging out regions with the mouse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6299 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6300 || f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6301 || f->clip_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6302 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6303 Dynarr_reset (w->line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6304 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6305 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6306 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6307
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6308 /* Return the very first buffer position contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6309 window's cache, or -1 if the cache is empty. Assumes that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6310 cache is valid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6311
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6312 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6313 line_start_cache_start (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6314 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6315 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6317 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6318 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6319 else
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6320 return Dynarr_atp (cache, 0)->start;
0
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 last 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_end (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, Dynarr_length (cache) - 1)->end;
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 index of the line POINT is contained within in window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6339 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
6340 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
6341 a guarantee of the number of entries in the cache present on either
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6342 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
6343 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
6344 allowed to shift. Returns -1 if POINT cannot be found in the cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6345 for any reason. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6346
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6347 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6348 point_in_line_start_cache (struct window *w, Bufpos point, int min_past)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6349 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6350 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6351 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6352 unsigned int top, bottom, pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6354 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6355 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6356
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6357 /* Let functions pass in negative values, but we still treat -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6358 specially. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6359 /* #### bogosity alert */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6360 if (min_past < 0 && min_past != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6361 min_past = -min_past;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6362
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6363 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6364 || line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6365 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6366 int loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6367 int win_char_height = window_char_height (w, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6369 /* Occasionally we get here with a 0 height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6370 window. find_next_newline_no_quit will abort if we pass it a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6371 count of 0 so handle that case. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6372 if (!win_char_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6373 win_char_height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6374
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6375 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6376 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6377 Bufpos from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6378 Bufpos to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6379
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6380 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6382 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6383 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6384 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6385 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6386 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6387 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6388
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6389 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6390
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6391 loop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6392 while (line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6393 && (loop < cache_adjustment || min_past == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6394 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6395 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6396
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6397 from = line_start_cache_start (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6398 if (from <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6399 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6401 from = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6402 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6404 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6405 loop++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6406 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6408 if (line_start_cache_start (w) > point)
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 = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6413 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6414 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6415 to = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6416 from = to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6417 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6418 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6419 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6420 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6421
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6422 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6423 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6424
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6425 loop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6426 while (line_start_cache_end (w) < point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6427 && (loop < cache_adjustment || min_past == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6428 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6429 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6430
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6431 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6432 if (to >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6433 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6434
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6435 from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6436 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6437
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6438 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6439 loop++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6440 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6441
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6442 if (line_start_cache_end (w) < point)
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 from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6447 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6448 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6449 to = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6450 from = to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6451 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6452 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6453 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6454 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6455
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6456 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6457 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6458 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6460 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6462 if (min_past == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6463 min_past = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6464
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6465 /* This could happen if the buffer is narrowed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6466 if (line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6467 || line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6468 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6469 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6470 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6471 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6472
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6473 find_point_loop:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6475 top = Dynarr_length (cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6476 bottom = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6477
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6478 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6479 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6480 unsigned int new_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6481 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6482
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6483 pos = (bottom + top + 1) >> 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6484 start = Dynarr_atp (cache, pos)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6485 end = Dynarr_atp (cache, pos)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6486
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6487 if (point >= start && point <= end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6488 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6489 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6490 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6491 Bufpos from =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6492 find_next_newline_no_quit (b, line_start_cache_start (w),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6493 -min_past - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6494 Bufpos to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6495
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6496 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6497 goto find_point_loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6498 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6499 else if ((Dynarr_length (cache) - pos - 1) < min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6500 && line_start_cache_end (w) < BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6501 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6502 Bufpos from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6503 Bufpos to = find_next_newline_no_quit (b, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6504 (min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6505 ? min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6506 : 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6507
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6508 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6509 goto find_point_loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6510 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6511 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6512 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6513 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6514 return pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6515 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6516 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6517 else if (point > end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6518 bottom = pos + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6519 else if (point < start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6520 top = pos - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6521 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6522 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6524 new_pos = (bottom + top + 1) >> 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6525 if (pos == new_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6526 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6527 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6528 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6529 }
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6533 /* Return a boolean indicating if POINT would be visible in window W
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6534 if display of the window was to begin at STARTP. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6535
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6536 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6537 point_would_be_visible (struct window *w, Bufpos startp, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6538 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6539 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6540 int pixpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6541 int bottom = WINDOW_TEXT_HEIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6542 int start_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6543
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6544 /* If point is before the intended start it obviously can't be visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6545 if (point < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6546 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6547
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6548 /* If point or start are not in the accessible buffer range, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6549 fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6550 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6551 || point < BUF_BEGV (b) || point > BUF_ZV (b))
267
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
6552 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6554 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6555 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6557 start_elt = point_in_line_start_cache (w, startp, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6558 if (start_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6559 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6560 w->line_cache_validation_override--;
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6564 assert (line_start_cache_start (w) <= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6565 && line_start_cache_end (w) >= startp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6567 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6568 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6569 int height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6570
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6571 /* Expand the cache if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6572 if (start_elt == Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6573 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6574 Bufpos old_startp =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6575 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6576
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6577 start_elt = point_in_line_start_cache (w, old_startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6578 window_char_height (w, 0));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6579
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6580 /* We've already actually processed old_startp, so increment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6581 immediately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6582 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6584 /* If this happens we didn't add any extra elements. Bummer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6585 if (start_elt == Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6586 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6587 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6588 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6589 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6590 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6592 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6593
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6594 if (pixpos + height > bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6595 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6596 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6597 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6598 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6599 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6600 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6601 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6602
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6603 pixpos += height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6604 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6605 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6606 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6607 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6608 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6610 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6611 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6612 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6613
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6614 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6615 the buffer position at the beginning or end of the last line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6616 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
6617 position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6618
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6619 WARNING: Under some circumstances it is possible that rediplay failed
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6620 to layout any lines for the windows. In that case this function returns
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6621 0 as an error condition when may_error is non-zero and a normalized
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6622 value of startp otherwise.
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6623 Under normal circumstances this is rare. However it seems that it does
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6624 occur in the following situation: A mouse event has come in and we need
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6625 to compute its location in a window. That code (in
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6626 pixel_to_glyph_translation) already can handle 0 as an error return
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6627 value.
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6628
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6629 #### With a little work this could probably be reworked as just a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6630 call to start_with_line_at_pixpos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6631
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6632 static Bufpos
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6633 start_end_of_last_line (struct window *w, Bufpos startp, int end,
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6634 int may_error)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6635 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6636 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6637 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6638 int pixpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6639 int bottom = WINDOW_TEXT_HEIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6640 Bufpos cur_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6641 int start_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6642
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6643 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6644 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6645
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6646 if (startp < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6647 startp = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6648 else if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6649 startp = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6650 cur_start = startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6651
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6652 start_elt = point_in_line_start_cache (w, cur_start, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6653 if (start_elt == -1)
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6654 return may_error ? 0 : startp;
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6655
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6656 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6657 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6658 int height = Dynarr_atp (cache, start_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6659
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6660 cur_start = Dynarr_atp (cache, start_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6661
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6662 if (pixpos + height > bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6663 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6664 /* Adjust for any possible clip. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6665 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6666 start_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6667
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6668 if (start_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6669 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6670 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6671 if (end)
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6672 return BUF_ZV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6673 else
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6674 return BUF_BEGV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6675 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6676 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6677 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6678 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6679 if (end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6680 return Dynarr_atp (cache, start_elt)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6681 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6682 return Dynarr_atp (cache, start_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6683 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6684 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6685
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6686 pixpos += height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6687 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6688 if (start_elt == Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6689 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6690 Bufpos from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6691 int win_char_height = window_char_height (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6692 Bufpos to = find_next_newline_no_quit (b, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6693 (win_char_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6694 ? win_char_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6695 : 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6697 /* 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
6698 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6699 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6700 w->line_cache_validation_override--;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6701 return BUF_ZV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6702 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6703
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6704 update_line_start_cache (w, from, to, BUF_PT (b), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6705
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6706 /* Updating the cache invalidates any current indexes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6707 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6708 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6709 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6710 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6711
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6712 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6713 the buffer position at the beginning of the last line displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6714
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6715 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6716 start_of_last_line (struct window *w, Bufpos startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6717 {
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6718 return start_end_of_last_line (w, startp, 0 , 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6719 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6720
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6721 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6722 the buffer position at the end of the last line displayed. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6723 also know as the window end position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6724
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6725 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6726 end_of_last_line (struct window *w, Bufpos startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6727 {
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6728 return start_end_of_last_line (w, startp, 1, 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6729 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6730
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6731 static Bufpos
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6732 end_of_last_line_may_error (struct window *w, Bufpos startp)
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6733 {
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6734 return start_end_of_last_line (w, startp, 1, 1);
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6735 }
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6736
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
6737
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6738 /* For window W, what does the starting position have to be so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6739 the line containing POINT will cover pixel position 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 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6742 start_with_line_at_pixpos (struct window *w, Bufpos point, int pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6743 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6744 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6745 int cur_elt;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6746 Bufpos cur_pos, prev_pos = point;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6747 int point_line_height;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6748 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6750 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6751 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6752
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6753 cur_elt = point_in_line_start_cache (w, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6754 /* #### See comment in update_line_start_cache about big minibuffers. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6755 if (cur_elt < 0)
267
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
6756 {
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
6757 w->line_cache_validation_override--;
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
6758 return point;
966663fcf606 Import from CVS: tag r20-5b32
cvs
parents: 265
diff changeset
6759 }
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6760
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6761 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6762
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6763 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6764 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6765 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6766
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6767 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6768
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6769 /* Do not take into account the value of vertical_clip here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6770 That is the responsibility of the calling functions. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6771 if (pixheight < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6772 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6773 w->line_cache_validation_override--;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6774 if (-pixheight > point_line_height)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6775 /* We can't make the target line cover pixpos, so put it
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6776 above pixpos. That way it will at least be visible. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
6777 return prev_pos;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6778 else
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6779 return cur_pos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6780 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6782 cur_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6783 if (cur_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6784 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6785 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6786 int win_char_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6788 if (cur_pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6789 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6790 w->line_cache_validation_override--;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6791 return BUF_BEGV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6792 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6794 win_char_height = window_char_height (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6795 if (!win_char_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6796 win_char_height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6797
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6798 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6799 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6800 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6802 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6803 assert (cur_elt >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6804 }
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6805 prev_pos = cur_pos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6806 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6807 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6808
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6809 /* For window W, what does the starting position have to be so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6810 the line containing point is on display line LINE. If LINE is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6811 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
6812 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
6813 considered to be the number of lines from the bottom (-1 is the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6814 bottom 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 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6817 start_with_point_on_display_line (struct window *w, Bufpos point, int line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6818 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6819 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6820 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6821
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6822 if (line >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6823 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6824 int cur_elt = point_in_line_start_cache (w, point, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6825
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6826 if (cur_elt - line < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6827 cur_elt = 0; /* Hit the top */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6828 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6829 cur_elt -= line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6830
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6831 w->line_cache_validation_override--;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6832 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6833 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6834 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6835 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6836 /* The calculated value of pixpos is correct for the bottom line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6837 or what we want when line is -1. Therefore we subtract one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6838 because we have already handled one line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6839 int new_line = -line - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6840 int cur_elt = point_in_line_start_cache (w, point, new_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6841 int pixpos = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6842 Bufpos retval, search_point;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6843
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6844 /* If scroll_on_clipped_lines is false, the last "visible" line of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6845 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
6846 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
6847 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
6848 containing point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6849 if (scroll_on_clipped_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6850 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6851 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6852 pixpos -= 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6854 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6855 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6856 /* Hit the bottom of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6857 int adjustment =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6858 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
6859 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6860 int defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6862 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6863 default_face_height_and_width (window, &defheight, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6864
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6865 cur_elt = Dynarr_length (w->line_start_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6867 pixpos -= (adjustment * defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6868 if (pixpos < WINDOW_TEXT_TOP (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6869 pixpos = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6870 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6871 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6872 cur_elt = cur_elt + new_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6873
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6874 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6876 retval = start_with_line_at_pixpos (w, search_point, pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6877 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6878 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6879 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6880 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6881
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6882 /* This is used to speed up vertical scrolling by caching the known
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6883 buffer starting positions for display lines. This allows the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6884 scrolling routines to avoid costly calls to regenerate_window. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6885 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
6886 display structs which are in the given range.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6887
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6888 Note also that the FROM/TO values are minimums. It is possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6889 that this function will actually add information outside of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6890 lines containing those positions. This can't hurt but it could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6891 possibly help.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6892
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6893 #### We currently force the cache to have only 1 contiguous region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6894 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
6895 cover more areas. This might, however, turn out to be a lot of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6896 overhead for too little gain. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6898 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6899 update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6900 Bufpos point, int no_regen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6901 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6902 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6903 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6904 Bufpos low_bound, high_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6905
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6906 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6907 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6908 updating_line_start_cache = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6909
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6910 if (from < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6911 from = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6912 if (to > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6913 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6914
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6915 if (from > to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6916 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6917 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6918 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6919 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6920 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6921
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6922 if (Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6923 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6924 low_bound = line_start_cache_start (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6925 high_bound = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6926
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6927 /* Check to see if the desired range is already in the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6928 if (from >= low_bound && to <= high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6929 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6930 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6931 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6932 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6933 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6934
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6935 /* Check to make sure that the desired range is adjacent to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6936 current cache. If not, invalidate the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6937 if (to < low_bound || from > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6938 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6939 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6940 low_bound = high_bound = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6941 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6942 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6943 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6944 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6945 low_bound = high_bound = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6946 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6947
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6948 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6949
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6950 /* This could be integrated into the next two sections, but it is easier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6951 to follow what's going on by having it separate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6952 if (no_regen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6953 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6954 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6955
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6956 update_internal_cache_list (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6957 if (!Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6958 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6959 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6960 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6961 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6962 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6964 start = Dynarr_atp (internal_cache, 0)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6965 end =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6966 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6967
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6968 /* We aren't allowed to generate additional information to fill in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6969 gaps, so if the DESIRED structs don't overlap the cache, reset the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6970 cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6971 if (Dynarr_length (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 if (end < low_bound || start > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6974 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6975
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6976 /* #### What should really happen if what we are doing is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6977 extending a line (the last line)? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6978 if (Dynarr_length (cache) == 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6979 && Dynarr_length (internal_cache) == 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6980 Dynarr_reset (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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6983 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6984 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6985 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6986 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6987 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6988 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6989 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6990 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6992 /* An extra check just in case the calling function didn't pass in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6993 the bounds of the DESIRED structs in the first place. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6994 if (start >= low_bound && end <= high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6995 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6996 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6997 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6998 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6999 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7001 /* At this point we know that the internal cache partially overlaps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7002 the main cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7003 if (start < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7004 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7005 int ic_elt = Dynarr_length (internal_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7006 while (ic_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7007 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7008 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7009 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7010 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7011 ic_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7012 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7013
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7014 if (!(ic_elt >= 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7015 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7016 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7017 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7018 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7019 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7020 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7021 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7022 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7023
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7024 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7025 ic_elt + 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7026 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7027
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7028 if (end > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7029 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7030 int ic_elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7032 while (ic_elt < Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7033 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7034 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7035 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7036 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7037 ic_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7038 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7039
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7040 if (!(ic_elt < Dynarr_length (internal_cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7041 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7042 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7043 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7044 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7045 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7046 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7047 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7048 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7049
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7050 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7051 Dynarr_length (internal_cache) - ic_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7052 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7053
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7054 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7055 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7056 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7057 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7058
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7059 if (!Dynarr_length (cache) || from < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7060 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7061 Bufpos startp = find_next_newline_no_quit (b, from, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7062 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7063 int old_lb = low_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7064
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7065 while (startp < old_lb || low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7066 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7067 int ic_elt;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7068 Bufpos new_startp;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7069
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7070 regenerate_window (w, startp, point, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7071 update_internal_cache_list (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7073 /* If this assert is triggered then regenerate_window failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7074 to layout a single line. That is not supposed to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7075 possible because we impose a minimum height on the buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7076 and override vertical clip when we are in here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7077 /* #### Ah, but it is because the window may temporarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7078 exist but not have any lines at all if the minibuffer is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7079 real big. Look into that situation better. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7080 if (!Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7081 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7082 if (old_lb == -1 && low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7083 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7084 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7085 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7086 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7087 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7088
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7089 assert (Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7090 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7091 assert (startp == Dynarr_atp (internal_cache, 0)->start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7092
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7093 ic_elt = Dynarr_length (internal_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7094 if (low_bound != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7095 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7096 while (ic_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7097 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7098 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7099 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7100 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7101 ic_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7102 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7103 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7104 assert (ic_elt >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7105
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7106 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7107
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7108 /*
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7109 * Handle invisible text properly:
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7110 * If the last line we're inserting has the same end as the
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7111 * line before which it will be added, merge the two lines.
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7112 */
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7113 if (Dynarr_length (cache) &&
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7114 Dynarr_atp (internal_cache, ic_elt)->end ==
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7115 Dynarr_atp (cache, marker)->end)
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7116 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7117 Dynarr_atp (cache, marker)->start
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7118 = Dynarr_atp (internal_cache, ic_elt)->start;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7119 Dynarr_atp (cache, marker)->height
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7120 = Dynarr_atp (internal_cache, ic_elt)->height;
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7121 ic_elt--;
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
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7124 if (ic_elt >= 0) /* we still have lines to add.. */
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7125 {
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7126 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7127 ic_elt + 1, marker);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7128 marker += (ic_elt + 1);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7129 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7131 if (startp < low_bound || low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7132 low_bound = startp;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7133 startp = new_startp;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7134 if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7135 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7136 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7137 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7138 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7139 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7140 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7141 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7143 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7144 assert (from >= low_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7146 /* Readjust the high_bound to account for any changes made while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7147 correcting the low_bound. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7148 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7150 if (to > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7151 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7152 Bufpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7154 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7155 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7156 regenerate_window (w, startp, point, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7157 update_internal_cache_list (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7159 /* See comment above about regenerate_window failing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7160 assert (Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7162 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7163 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7164 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7165 startp = high_bound + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7166 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7167 while (to > high_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7168 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7169
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7170 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7171 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7172 assert (to <= high_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7173 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7174
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7176 /* Given x and y coordinates in characters, relative to a window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7177 return the pixel location corresponding to those coordinates. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7178 pixel location returned is the center of the given character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7179 position. The pixel values are generated relative to the window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7180 not the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7182 The modeline is considered to be part of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7183
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7184 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7185 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7186 int *pix_x, int *pix_y)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7187 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7188 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7189 int num_disp_lines, modeline;
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7190 Lisp_Object window;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7191 int 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 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7194 default_face_height_and_width (window, &defheight, &defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7196 /* 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
7197 the window, use the first window line or character position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7198 instead. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7199 if (char_y < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7200 char_y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7201 if (char_x < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7202 char_x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7204 num_disp_lines = Dynarr_length (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7205 modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7206 if (num_disp_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7207 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7208 if (Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7209 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7210 num_disp_lines--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7211 modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7212 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7213 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7214
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7215 /* First check if the y position intersects the display lines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7216 if (char_y < num_disp_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7217 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7218 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7219 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7221 *pix_y = (dl->ypos - dl->ascent +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7222 ((unsigned int) (dl->ascent + dl->descent - dl->clip) >> 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7223
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7224 if (char_x < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7225 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7226 struct rune *rb = Dynarr_atp (db->runes, char_x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7227
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7228 *pix_x = rb->xpos + (rb->width >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7229 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7230 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7231 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7232 int last_rune = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7233 struct rune *rb = Dynarr_atp (db->runes, last_rune);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7234
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7235 char_x -= last_rune;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7237 *pix_x = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7238 *pix_x += ((char_x - 1) * defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7239 *pix_x += (defwidth >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7240 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7241 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7242 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7243 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7244 /* It didn't intersect, so extrapolate. #### For now, we include the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7245 modeline in this since we don't have true character positions in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7246 it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7248 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7249 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7251 char_y -= num_disp_lines;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7252
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7253 if (Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7254 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7255 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7256 *pix_y = dl->ypos + dl->descent - dl->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7257 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7258 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7259 *pix_y = WINDOW_TEXT_TOP (w);
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_y += (char_y * defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7262 *pix_y += (defheight >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7263
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7264 *pix_x = WINDOW_TEXT_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7265 /* Don't adjust by one because this is still the unadjusted value. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7266 *pix_x += (char_x * defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7267 *pix_x += (defwidth >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7268 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7270 if (*pix_x > w->pixel_left + w->pixel_width)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
7271 *pix_x = w->pixel_left + w->pixel_width;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7272 if (*pix_y > w->pixel_top + w->pixel_height)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
7273 *pix_y = w->pixel_top + w->pixel_height;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7274
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7275 *pix_x -= w->pixel_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7276 *pix_y -= w->pixel_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7277 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7278
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7279 /* Given a display line and a position, determine if there is a glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7280 there and return information about it if there is. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7281
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7282 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7283 get_position_object (struct display_line *dl, Lisp_Object *obj1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7284 Lisp_Object *obj2, int x_coord, int *low_x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7285 int *high_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7286 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7287 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7288 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7289 int block =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7290 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7291
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7292 /* We use get_next_display_block to get the actual display block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7293 that would be displayed at x_coord. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7295 if (block == NO_BLOCK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7296 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7297 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7298 db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7300 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7301 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7302 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7303
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7304 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7305 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7306 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7307 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7308 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7309 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7310 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7311 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7312 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7313 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7314 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7315 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7317 if (low_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7318 *low_x_coord = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7319 if (high_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7320 *high_x_coord = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7321
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7322 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7323 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7324 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7325 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7327 #define UPDATE_CACHE_RETURN \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7328 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7329 d->pixel_to_glyph_cache.valid = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7330 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7331 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7332 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7333 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7334 d->pixel_to_glyph_cache.frame = f; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7335 d->pixel_to_glyph_cache.col = *col; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7336 d->pixel_to_glyph_cache.row = *row; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7337 d->pixel_to_glyph_cache.obj_x = *obj_x; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7338 d->pixel_to_glyph_cache.obj_y = *obj_y; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7339 d->pixel_to_glyph_cache.w = *w; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7340 d->pixel_to_glyph_cache.bufpos = *bufpos; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7341 d->pixel_to_glyph_cache.closest = *closest; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7342 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7343 d->pixel_to_glyph_cache.obj1 = *obj1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7344 d->pixel_to_glyph_cache.obj2 = *obj2; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7345 d->pixel_to_glyph_cache.retval = position; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7346 RETURN__ position; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7347 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7349 /* Given x and y coordinates in pixels relative to a frame, return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7350 information about what is located under those coordinates.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7351
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7352 The return value will be one of:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7354 OVER_TOOLBAR: over one of the 4 frame toolbars
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7355 OVER_MODELINE: over a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7356 OVER_BORDER: over an internal border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7357 OVER_NOTHING: over the text area, but not over text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7358 OVER_OUTSIDE: outside of the frame border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7359 OVER_TEXT: over text in the text area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7360
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7361 OBJ1 is one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7362
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7363 -- a toolbar button
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7364 -- a glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7365 -- nil if the coordinates are not over a glyph or a toolbar button.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7367 OBJ2 is one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7369 -- an extent, if the coordinates are over a glyph in the text area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7370 -- nil otherwise.
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 glyph, 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 glyph.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7374
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7375 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
7376 equivalent coordinates relative to the upper-left corner of the character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7378 Otherwise, OBJ_X and OBJ_Y are undefined.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7379 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7380
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7381 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7382 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7383 int *col, int *row, int *obj_x, int *obj_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7384 struct window **w, Bufpos *bufpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7385 Bufpos *closest, Charcount *modeline_closest,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7386 Lisp_Object *obj1, Lisp_Object *obj2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7387 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7388 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7389 struct pixel_to_glyph_translation_cache *cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7390 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7391 int frm_left, frm_right, frm_top, frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7392 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7393 int position = OVER_NOTHING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7394 int device_check_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7395 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7396
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7397 /* 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
7398 the middle of being deleted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7399 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7400 {
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7401 device_check_failed = 1;
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7402 d = NULL, cache = NULL; /* Warning suppression */
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7403 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7404 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7405 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7406 d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7407 cache = &d->pixel_to_glyph_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7408 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7409
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7410 if (!device_check_failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7411 && cache->valid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7412 && cache->frame == f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7413 && cache->low_x_coord <= x_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7414 && cache->high_x_coord > x_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7415 && cache->low_y_coord <= y_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7416 && cache->high_y_coord > y_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7417 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7418 *col = cache->col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7419 *row = cache->row;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7420 *obj_x = cache->obj_x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7421 *obj_y = cache->obj_y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7422 *w = cache->w;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7423 *bufpos = cache->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7424 *closest = cache->closest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7425 *modeline_closest = cache->modeline_closest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7426 *obj1 = cache->obj1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7427 *obj2 = cache->obj2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7428
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7429 return cache->retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7430 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7431 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7432 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7433 *col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7434 *row = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7435 *obj_x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7436 *obj_y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7437 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7438 *bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7439 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7440 *modeline_closest = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7441 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7442 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7444 low_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7445 high_x_coord = x_coord + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7446 low_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7447 high_y_coord = y_coord + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7448 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7450 if (device_check_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7451 return OVER_NOTHING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7453 frm_left = FRAME_LEFT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7454 frm_right = FRAME_RIGHT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7455 frm_top = FRAME_TOP_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7456 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7458 /* Check if the mouse is outside of the text area actually used by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7459 redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7460 if (y_coord < frm_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7461 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7462 if (y_coord >= FRAME_TOP_BORDER_START (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7463 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7464 low_y_coord = FRAME_TOP_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7465 high_y_coord = frm_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7466 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7467 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7468 else if (y_coord >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7469 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7470 low_y_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7471 high_y_coord = FRAME_TOP_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7472 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7473 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7474 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7475 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7476 low_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7477 high_y_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7478 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7479 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7480 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7481 else if (y_coord >= frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7482 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7483 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7484 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7485 low_y_coord = frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7486 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7487 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7488 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7489 else if (y_coord < FRAME_PIXHEIGHT (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7490 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7491 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7492 high_y_coord = FRAME_PIXHEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7493 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7494 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7495 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7496 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7497 low_y_coord = FRAME_PIXHEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7498 high_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7499 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7500 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7501 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7502
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7503 if (position != OVER_TOOLBAR && position != OVER_BORDER)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7504 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7505 if (x_coord < frm_left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7506 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7507 if (x_coord >= FRAME_LEFT_BORDER_START (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7508 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7509 low_x_coord = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7510 high_x_coord = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7511 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7512 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7513 else if (x_coord >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7514 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7515 low_x_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7516 high_x_coord = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7517 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7518 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7519 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7520 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7521 low_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7522 high_x_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7523 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7524 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7525 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7526 else if (x_coord >= frm_right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7527 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7528 if (x_coord < FRAME_RIGHT_BORDER_END (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7529 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7530 low_x_coord = frm_right;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7531 high_x_coord = FRAME_RIGHT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7532 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7533 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7534 else if (x_coord < FRAME_PIXWIDTH (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7535 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7536 low_x_coord = FRAME_RIGHT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7537 high_x_coord = FRAME_PIXWIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7538 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7539 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7540 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7541 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7542 low_x_coord = FRAME_PIXWIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7543 high_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7544 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7545 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7546 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7547 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7549 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7550 if (position == OVER_TOOLBAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7551 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7552 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7553 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7554 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7555 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7556 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
7557 #endif /* HAVE_TOOLBARS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7559 /* 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
7560 relative y position even if it is outside the x boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7561 if (x_coord < frm_left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7562 x_coord = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7563 else if (x_coord > frm_right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7564 x_coord = frm_right;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7566 /* Same in reverse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7567 if (y_coord < frm_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7568 y_coord = frm_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7569 else if (y_coord > frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7570 y_coord = frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7571
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7572 /* Find what window the given coordinates are actually in. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7573 window = f->root_window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7574 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7575
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7576 /* If we didn't find a window, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7577 if (!*w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7578 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7579 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7580 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7581 else if (position != OVER_NOTHING)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7582 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7583 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7584 *modeline_closest = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7586 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7587 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7588 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7589 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7590 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7591 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7592
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7593 /* Check if the window is a minibuffer but isn't active. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7594 if (MINI_WINDOW_P (*w) && !minibuf_level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7595 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7596 /* Must reset the window value since some callers will ignore
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7597 the return value if it is set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7598 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7599 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7600 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7601
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7602 /* See if the point is over window vertical divider */
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7603 if (window_needs_vertical_divider (*w))
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7604 {
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7605 int div_x_high = WINDOW_RIGHT (*w);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7606 int div_x_low = div_x_high - window_divider_width (*w);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7607 int div_y_high = WINDOW_BOTTOM (*w);
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7608 int div_y_low = WINDOW_TOP (*w);
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 if (div_x_low < x_coord && x_coord <= div_x_high &&
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7611 div_y_low < y_coord && y_coord <= div_y_high)
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7612 {
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7613 low_x_coord = div_x_low;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7614 high_x_coord = div_x_high;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7615 low_y_coord = div_y_low;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7616 high_y_coord = div_y_high;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7617 position = OVER_V_DIVIDER;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7618 UPDATE_CACHE_RETURN;
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7619 }
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7620 }
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
7621
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7622 dla = window_display_lines (*w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7623
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7624 for (*row = 0; *row < Dynarr_length (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 int really_over_nothing = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7627 struct display_line *dl = Dynarr_atp (dla, *row);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7629 if ((int) (dl->ypos - dl->ascent) <= y_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7630 && y_coord <= (int) (dl->ypos + dl->descent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7631 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7632 int check_margin_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7633 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7634 struct rune *rb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7635
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7636 if (x_coord < dl->bounds.left_white
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7637 || x_coord >= dl->bounds.right_white)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7638 check_margin_glyphs = 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 low_y_coord = dl->ypos - dl->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7641 high_y_coord = dl->ypos + dl->descent + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7642
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7643 if (position == OVER_BORDER
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7644 || position == OVER_OUTSIDE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7645 || check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7646 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7647 int x_check, left_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7648
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7649 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7650 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7651 x_check = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7652 left_bound = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7653 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7654 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7655 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7656 x_check = high_x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7657 left_bound = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7658 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7659
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7660 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7661 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7662 if (x_check <= left_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7663 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7664 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7665 *modeline_closest = Dynarr_atp (db->runes, 0)->bufpos;
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 *closest = Dynarr_atp (db->runes, 0)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7668 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7669 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7670 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7671 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7672 *modeline_closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7673 Dynarr_atp (db->runes,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7674 Dynarr_length (db->runes) - 1)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7675 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7676 *closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7677 Dynarr_atp (db->runes,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
7678 Dynarr_length (db->runes) - 1)->bufpos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7679 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7680
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7681 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7682 *modeline_closest += dl->offset;
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 *closest += dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7685 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7686 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7687 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7688 /* #### What should be here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7689 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7690 *modeline_closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7691 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7692 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7693 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7694
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7695 if (check_margin_glyphs)
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 (x_coord < dl->bounds.left_in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7698 || x_coord >= dl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7699 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7700 /* If we are over the outside margins then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7701 know the loop over the text block isn't going
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7702 to accomplish anything. So we go ahead and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7703 set what information we can right here and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7704 return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7705 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7706 *obj_y = y_coord - (dl->ypos - dl->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7707 get_position_object (dl, obj1, obj2, x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7708 &low_x_coord, &high_x_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7710 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7711 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7712 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7713 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7714 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7715 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7716
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7717 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7718 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7719 int past_end = (*col == Dynarr_length (db->runes));
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 = Dynarr_atp (db->runes, *col);
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 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7726 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7727 if (past_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7728 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7729 (*col)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7730 rb = Dynarr_atp (db->runes, *col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7731 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7732
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7733 *bufpos = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7734 low_x_coord = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7735 high_x_coord = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7736
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7737 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7738 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7739 int elt = *col + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7741 /* Find the first character after the glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7742 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7743 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7744 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7745 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7746 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7747 *modeline_closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7748 (Dynarr_atp (db->runes, elt)->bufpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7749 dl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7750 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7751 *closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7752 (Dynarr_atp (db->runes, elt)->bufpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7753 dl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7754 break;
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 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7758 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7759
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7760 /* In this case we failed to find a non-glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7761 character so we return the last position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7762 displayed on the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7763 if (elt == Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7764 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7765 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7766 *modeline_closest = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7767 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7768 *closest = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7769 really_over_nothing = 1;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
7770 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7771 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7772 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7773 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7774 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7775 *modeline_closest = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7776 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7777 *closest = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7778 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7779
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7780 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7781 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7782 *row = window_displayed_height (*w);
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 (position == OVER_NOTHING)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7785 position = OVER_MODELINE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7786
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7787 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7788 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7789 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7790 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7791 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7792 else if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7793 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7794 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7795 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7796 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7797 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7798 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7799 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7800 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7801 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7802
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7803 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7804 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7805 else if (past_end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7806 || (rb->type == RUNE_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7807 && rb->object.chr.ch == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7808 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7809 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7810 /* At this point we may have glyphs in the right
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7811 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7812 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7813 get_position_object (dl, obj1, obj2, x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7814 &low_x_coord, &high_x_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7815 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7816 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7817 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7818 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7819 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7820 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7821 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7822 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7823 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7824 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7825 else if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7826 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7827 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7828 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7829 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7830 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7831 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7832 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7833 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7834 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7835
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7836 *obj_x = x_coord - rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7837 *obj_y = y_coord - (dl->ypos - dl->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7839 /* At this point we may have glyphs in the left
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7840 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7841 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7842 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7843
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7844 if (position == OVER_NOTHING && !really_over_nothing)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7845 position = OVER_TEXT;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7846
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7847 UPDATE_CACHE_RETURN;
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 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7852 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7854 *row = Dynarr_length (dla) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7855 if (FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7856 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7857 int bot_elt = Dynarr_length (dla) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7858
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7859 if (bot_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7860 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7861 struct display_line *dl = Dynarr_atp (dla, bot_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7862 int adj_area = y_coord - (dl->ypos + dl->descent);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
7863 Lisp_Object lwin;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7864 int 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 XSETWINDOW (lwin, *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7867 default_face_height_and_width (lwin, 0, &defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7868
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7869 *row += (adj_area / defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7870 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7871 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7872
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7873 /* #### This should be checked out some more to determine what
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7874 should really be going on. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7875 if (!MARKERP ((*w)->start[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7876 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7877 else
361
7347b34c275b Import from CVS: tag r21-1-10
cvs
parents: 343
diff changeset
7878 *closest = end_of_last_line_may_error (*w,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7879 marker_position ((*w)->start[CURRENT_DISP]));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7880 *col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7881 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7882 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7883 #undef UPDATE_CACHE_RETURN
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7884
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7885
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 /* Lisp functions */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7889 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7890 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7891
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7892 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7893 Ensure that all minibuffers are correctly showing the echo area.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7894 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7895 ())
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7896 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7897 Lisp_Object devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7898
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7899 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7900 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7901 struct device *d = XDEVICE (XCAR (devcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7902 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7903
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7904 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7905 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7906 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7907
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
7908 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7909 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7910 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
7911 /*
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7912 * If the frame size has changed, there may be random
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7913 * chud on the screen left from previous messages
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7914 * because redisplay_frame hasn't been called yet.
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7915 * Clear the screen to get rid of the potential mess.
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
7916 */
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7917 if (f->echo_area_garbaged)
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7918 {
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7919 DEVMETH (d, clear_frame, (f));
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7920 f->echo_area_garbaged = 0;
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7921 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7922 redisplay_window (window, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7923 call_redisplay_end_triggers (XWINDOW (window), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7924 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7925 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7926
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7927 /* We now call the output_end routine for tty frames. We delay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7928 doing so in order to avoid cursor flicker. So much for 100%
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7929 encapsulation. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7930 if (DEVICE_TTY_P (d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7931 DEVMETH (d, output_end, (d));
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 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7935 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7936
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7937 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7938 restore_disable_preemption_value (Lisp_Object value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7939 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7940 disable_preemption = XINT (value);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7941 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7942 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7943
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7944 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7945 Clear frame FRAME and output again what is supposed to appear on it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7946 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7947 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7948 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
7949 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7950 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7951 (frame, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7952 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7953 struct frame *f = decode_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7954 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7955
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7956 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7957 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7958 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7959 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7960 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7961 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7962
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7963 f->clear = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7964 redisplay_frame (f, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7965
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7966 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7967 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7968
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7969 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7970 Ensure that FRAME's contents are correctly displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7971 This differs from `redraw-frame' in that it only redraws what needs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7972 be updated, as opposed to unconditionally clearing and redrawing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7973 the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7974 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7975 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7976 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
7977 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7978 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7979 (frame, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7980 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7981 struct frame *f = decode_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7982 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7983
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7984 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7985 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7986 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7987 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7988 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7989 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7990
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7991 redisplay_frame (f, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7992
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7993 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7994 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7995
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7996 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7997 Clear device DEVICE and output again what is supposed to appear on it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7998 DEVICE defaults to the selected device if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7999 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8000 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
8001 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8002 */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
8003 (device, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8004 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8005 struct device *d = decode_device (device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8006 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8007 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8008
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8009 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8010 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8011 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8012 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8013 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8014 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8015
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8016 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8017 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8018 XFRAME (XCAR (frmcons))->clear = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8019 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8020 redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8022 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8023 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8024
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8025 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8026 Ensure that DEVICE's contents are correctly displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8027 This differs from `redraw-device' in that it only redraws what needs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8028 be updated, as opposed to unconditionally clearing and redrawing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8029 the device.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8030 DEVICE defaults to the selected device if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8031 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8032 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
8033 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8034 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8035 (device, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8036 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8037 struct device *d = decode_device (device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8038 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8039
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8040 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8041 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8042 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8043 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8044 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8045 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8047 redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8049 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8050 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8051
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8052 /* Big lie. Big lie. This will force all modelines to be updated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8053 regardless if the all flag is set or not. It remains in existence
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8054 solely for backwards compatibility. */
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8055 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8056 Force the modeline of the current buffer to be redisplayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8057 With optional non-nil ALL, force redisplay of all modelines.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8058 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8059 (all))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8060 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8061 MARK_MODELINE_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8062 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8063 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8064
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8065 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8066 Force an immediate update of the cursor on FRAME.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8067 FRAME defaults to the selected frame if omitted.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8068 */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
8069 (frame))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8070 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8071 redisplay_redraw_cursor (decode_frame (frame), 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8072 return Qnil;
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
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 /* Lisp-variable change triggers */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8079 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8080 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8081
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8082 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8083 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8084 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8085 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8086 /* Nothing to be done? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8087 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8088
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8089 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8090 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8091 Lisp_Object in_object, int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8092 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8093 /* #### clip_changed should really be renamed something like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8094 global_redisplay_change. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8095 MARK_CLIP_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8096 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8097 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8099 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8100 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8101 Lisp_Object locale)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8102 {
269
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8103 if (WINDOWP (locale))
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8104 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8105 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (locale)));
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8106 MARK_FRAME_GLYPHS_CHANGED (f);
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 (FRAMEP (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 struct frame *f = XFRAME (locale);
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8111 MARK_FRAME_GLYPHS_CHANGED (f);
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8112 }
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8113 else if (DEVICEP (locale))
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8114 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8115 Lisp_Object frmcons;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8116 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8117 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8118 struct frame *f = XFRAME (XCAR (frmcons));
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8119 MARK_FRAME_GLYPHS_CHANGED (f);
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8120 }
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 else if (CONSOLEP (locale))
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8123 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8124 Lisp_Object frmcons, devcons;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8125 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8126 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8127 struct frame *f = XFRAME (XCAR (frmcons));
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8128 MARK_FRAME_GLYPHS_CHANGED (f);
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8129 }
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8130 }
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8131 else /* global or buffer */
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8132 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8133 Lisp_Object frmcons, devcons, concons;
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8134 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8135 {
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8136 struct frame *f = XFRAME (XCAR (frmcons));
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8137 MARK_FRAME_GLYPHS_CHANGED (f);
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8138 }
b2472a1930f2 Import from CVS: tag r20-5b33
cvs
parents: 267
diff changeset
8139 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8140 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8141
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8142 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8143 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8144 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8145 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8146 if (XFRAME (w->frame)->init_finished)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8147 Fforce_cursor_redisplay (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8148 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8150 #ifdef MEMORY_USAGE_STATS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8151
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8153 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8154 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8155 /* memory usage computation */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8156 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8157 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8159 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8160 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8161 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8162 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8165 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8166 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8167 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8168 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8169 int total, i;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8170
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8171 if (!dyn)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8172 return 0;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8173
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8174 total = Dynarr_memory_usage (dyn, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8175 for (i = 0; i < Dynarr_largest (dyn); i++)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8176 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8177
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8178 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8179 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8180
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8181 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8182 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8183 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8184 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8185 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8186 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8187
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8188 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8189 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8190 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8191 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8192 int total, i;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8193
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8194 if (!dyn)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8195 return 0;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8196
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8197 total = Dynarr_memory_usage (dyn, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8198 for (i = 0; i < Dynarr_largest (dyn); i++)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8199 {
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8200 struct display_line *dl = &Dynarr_at (dyn, i);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8201 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8202 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8203 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
0
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 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8207 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8208
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8209 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8210 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8211 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8212 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8213 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8214 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8216 #endif /* MEMORY_USAGE_STATS */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8219 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8220 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8221 /* initialization */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8222 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8223 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8225 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8226 init_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8227 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8228 disable_preemption = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8229 preemption_count = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8230 max_preempts = INIT_MAX_PREEMPTS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8232 if (!initialized)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8233 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
8234 cmotion_display_lines = Dynarr_new (display_line);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8235 mode_spec_bufbyte_string = Dynarr_new (Bufbyte);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8236 formatted_string_emchar_dynarr = Dynarr_new (Emchar);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
8237 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8238 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8239 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
8240 internal_cache = Dynarr_new (line_start_cache);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
8241 xzero (formatted_string_display_line);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8242 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8244 /* window system is nil when in -batch mode */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8245 if (!initialized || noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8246 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8248 /* If the user wants to use a window system, we shouldn't bother
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8249 initializing the terminal. This is especially important when the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8250 terminal is so dumb that emacs gives up before and doesn't bother
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8251 using the window system.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8252
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8253 If the DISPLAY environment variable is set, try to use X, and die
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8254 with an error message if that doesn't work. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8255
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8256 #ifdef HAVE_X_WINDOWS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8257 if (!strcmp (display_use, "x"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8258 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8259 /* Some stuff checks this way early. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8260 Vwindow_system = Qx;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8261 Vinitial_window_system = Qx;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8262 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8263 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8264 #endif /* HAVE_X_WINDOWS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8265
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8266 #ifdef HAVE_MS_WINDOWS
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8267 if (!strcmp (display_use, "mswindows"))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8268 {
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8269 /* Some stuff checks this way early. */
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8270 Vwindow_system = Qmswindows;
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8271 Vinitial_window_system = Qmswindows;
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8272 return;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8273 }
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8274 #endif /* HAVE_MS_WINDOWS */
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8275
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8276 #ifdef HAVE_TTY
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8277 /* If no window system has been specified, try to use the terminal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8278 if (!isatty (0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8279 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8280 stderr_out ("XEmacs: standard input is not a tty\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8281 exit (1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8282 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8283
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8284 /* Look at the TERM variable */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8285 if (!getenv ("TERM"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8286 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8287 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8288 exit (1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8289 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8291 Vinitial_window_system = Qtty;
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8292 return;
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8293 #else /* not HAVE_TTY */
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8294 /* No DISPLAY specified, and no TTY support. */
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8295 stderr_out ("XEmacs: Cannot open display.\n\
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8296 Please set the environmental variable DISPLAY to an appropriate value.\n");
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8297 exit (1);
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8298 #endif
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8299 /* Unreached. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8300 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8301
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8302 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8303 syms_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8304 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8305 defsymbol (&Qcursor_in_echo_area, "cursor-in-echo-area");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8306 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8307 defsymbol (&Qpre_redisplay_hook, "pre-redisplay-hook");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8308 defsymbol (&Qpost_redisplay_hook, "post-redisplay-hook");
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8309 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8310 defsymbol (&Qdisplay_warning_buffer, "display-warning-buffer");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8311 defsymbol (&Qbar_cursor, "bar-cursor");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8312 defsymbol (&Qwindow_scroll_functions, "window-scroll-functions");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8313 defsymbol (&Qredisplay_end_trigger_functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8314 "redisplay-end-trigger-functions");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8315
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8316 DEFSUBR (Fredisplay_echo_area);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8317 DEFSUBR (Fredraw_frame);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8318 DEFSUBR (Fredisplay_frame);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8319 DEFSUBR (Fredraw_device);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8320 DEFSUBR (Fredisplay_device);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8321 DEFSUBR (Fredraw_modeline);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8322 DEFSUBR (Fforce_cursor_redisplay);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8323 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8324
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8325 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8326 vars_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8327 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8328 #if 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8329 staticpro (&last_arrow_position);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8330 staticpro (&last_arrow_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8331 last_arrow_position = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8332 last_arrow_string = Qnil;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8333 #endif /* 0 */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8334
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8335 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8337 /* #### Probably temporary */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8338 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 269
diff changeset
8339 \(Temporary) Setting this will impact the performance of the internal
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8340 line start cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8341 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8342 cache_adjustment = 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8343
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8344 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8345 Minimum pixel height for clipped bottom display line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8346 A clipped line shorter than this won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8347 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8348 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8349 vertical_clip = 5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8351 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8352 Minimum visible area for clipped glyphs at right boundary.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8353 Clipped glyphs shorter than this won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8354 Only pixmap glyph instances are currently allowed to be clipped.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8355 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8356 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8357 horizontal_clip = 5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8358
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8359 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
8360 String displayed by modeline-format's "%m" specification.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8361 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8362 Vglobal_mode_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_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8365 Marker for where to display an arrow on top of the buffer text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8366 This must be the beginning of a line in order to work.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8367 See also `overlay-arrow-string'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8368 */ , redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8369 Voverlay_arrow_position = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8370
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8371 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8372 String to display as an arrow. See also `overlay-arrow-position'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8373 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8374 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8375 Voverlay_arrow_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8376
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8377 DEFVAR_INT ("scroll-step", &scroll_step /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8378 *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
8379 If that fails to bring point back on frame, point is centered instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8380 If this is zero, point is always centered after it moves off screen.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8381 */ );
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8382 scroll_step = 0;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8383
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8384 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8385 *Scroll up to this many lines, to bring point back on screen.
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8386 */ );
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8387 scroll_conservatively = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8388
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8389 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8390 &truncate_partial_width_windows /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8391 *Non-nil means truncate lines in all windows less than full frame wide.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8392 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8393 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8394 truncate_partial_width_windows = 1;
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_BOOL ("visible-bell", &visible_bell /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8397 *Non-nil means try to flash the frame to represent a bell.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8398 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8399 visible_bell = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8401 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8402 *Non-nil means no need to redraw entire frame after suspending.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8403 A non-nil value is useful if the terminal can automatically preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8404 Emacs's frame display when you reenter Emacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8405 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
8406 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8407 no_redraw_on_reenter = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8409 DEFVAR_LISP ("window-system", &Vwindow_system /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8410 A symbol naming the window-system under which Emacs is running,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8411 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
8412
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8413 Do not use this variable, except for GNU Emacs compatibility, as it
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8414 gives wrong values in a multi-device environment. Use `console-type'
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8415 instead.
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 Vwindow_system = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8419 /* #### Temporary shit until window-system is eliminated. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8420 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8421 DON'T TOUCH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8422 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8423 Vinitial_window_system = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8424
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8425 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8426 Non-nil means put cursor in minibuffer, at end of any message there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8427 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8428 cursor_in_echo_area = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8430 /* #### Shouldn't this be generalized as follows:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8431
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8432 if nil, use block cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8433 if a number, use a bar cursor of that width.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8434 Otherwise, use a 1-pixel bar cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8435
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8436 #### Or better yet, this variable should be trashed entirely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8437 (use a Lisp-magic variable to maintain compatibility)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8438 and a specifier `cursor-shape' added, which allows a block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8439 cursor, a bar cursor, a flashing block or bar cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8440 maybe a caret cursor, etc. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8441
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8442 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8443 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
8444 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8445 Vbar_cursor = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8447 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8448 xxDEFVAR_LISP ("pre-redisplay-hook", &Vpre_redisplay_hook /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8449 Function or functions to run before every redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8450 Functions on this hook must be careful to avoid signalling errors!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8451 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8452 Vpre_redisplay_hook = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8453
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8454 xxDEFVAR_LISP ("post-redisplay-hook", &Vpost_redisplay_hook /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8455 Function or functions to run after every redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8456 Functions on this hook must be careful to avoid signalling errors!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8457 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8458 Vpost_redisplay_hook = Qnil;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8459 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8461 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8462 Bump this to tell the C code to call `display-warning-buffer'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8463 at next redisplay. You should not normally change this; the function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8464 `display-warning' automatically does this at appropriate times.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8465 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8466 display_warning_tick = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8468 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8469 Non-nil means inhibit display of warning messages.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8470 You should *bind* this, not set it. Any pending warning messages
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8471 will be displayed when the binding no longer applies.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8472 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8473 /* reset to 0 by startup.el after the splash screen has displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8474 This way, the warnings don't obliterate the splash screen. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8475 inhibit_warning_display = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8477 DEFVAR_LISP ("window-size-change-functions",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8478 &Vwindow_size_change_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8479 Not currently implemented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8480 Functions called before redisplay, if window sizes have changed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8481 The value should be a list of functions that take one argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8482 Just before redisplay, for each frame, if any of its windows have changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8483 size since the last redisplay, or have been split or deleted,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8484 all the functions in the list are called, with the frame as argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8485 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8486 Vwindow_size_change_functions = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8488 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8489 Not currently implemented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8490 Functions to call before redisplaying a window with scrolling.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8491 Each function is called with two arguments, the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8492 and its new display-start position. Note that the value of `window-end'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8493 is not valid when these functions are called.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8494 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8495 Vwindow_scroll_functions = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8496
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8497 DEFVAR_LISP ("redisplay-end-trigger-functions",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8498 &Vredisplay_end_trigger_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8499 See `set-window-redisplay-end-trigger'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8500 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8501 Vredisplay_end_trigger_functions = Qnil;
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8502
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8503 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
8504 *Non-nil means column display number starts at 1.
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8505 */ );
294
4b85ae5eabfb Import from CVS: tag r21-0b45
cvs
parents: 284
diff changeset
8506 column_number_start_at_one = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8507 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8508
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8509 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8510 specifier_vars_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8511 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8512 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8513 *Width of left margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8514 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8515 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8516 Vleft_margin_width = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8517 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8518 set_specifier_caching (Vleft_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8519 slot_offset (struct window, left_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8520 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8521 slot_offset (struct frame, left_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8522 margin_width_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8524 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8525 *Width of right margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8526 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8527 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8528 Vright_margin_width = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8529 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8530 set_specifier_caching (Vright_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8531 slot_offset (struct window, right_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8532 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8533 slot_offset (struct frame, right_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8534 margin_width_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8535
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8536 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8537 *Minimum ascent height of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8538 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8539 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8540 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8541 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8542 set_specifier_caching (Vminimum_line_ascent,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8543 slot_offset (struct window, minimum_line_ascent),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8544 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8545 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8546
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8547 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8548 *Minimum descent height of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8549 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8550 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8551 Vminimum_line_descent = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8552 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8553 set_specifier_caching (Vminimum_line_descent,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8554 slot_offset (struct window, minimum_line_descent),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8555 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8556 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8557
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8558 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8559 *Non-nil means use the left outside margin as extra whitespace when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8560 displaying 'whitespace or 'inside-margin glyphs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8561 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8562 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8563 Vuse_left_overflow = Fmake_specifier (Qboolean);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8564 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8565 set_specifier_caching (Vuse_left_overflow,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8566 slot_offset (struct window, use_left_overflow),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8567 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8568 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8569
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8570 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8571 *Non-nil means use the right outside margin as extra whitespace when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8572 displaying 'whitespace or 'inside-margin glyphs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8573 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8574 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8575 Vuse_right_overflow = Fmake_specifier (Qboolean);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8576 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8577 set_specifier_caching (Vuse_right_overflow,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8578 slot_offset (struct window, use_right_overflow),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8579 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8580 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8581
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8582 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8583 *Non-nil means the text cursor is visible (this is usually the case).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8584 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8585 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8586 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8587 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8588 set_specifier_caching (Vtext_cursor_visible_p,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8589 slot_offset (struct window, text_cursor_visible_p),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8590 text_cursor_visible_p_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8591 0, 0);
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8592
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8593 }