annotate src/redisplay.c @ 243:f220cc83d72e r20-5b20

Import from CVS: tag r20-5b20
author cvs
date Mon, 13 Aug 2007 10:17:07 +0200
parents 0e522484dd2a
children 83b3d10dcba9
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"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 #include "commands.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 #include "debug.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 #include "device.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 #include "extents.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 #include "faces.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 #include "frame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 #include "glyphs.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 #include "insdel.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 #include "menubar.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 #include "objects.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 #include "process.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 #include "redisplay.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 #include "toolbar.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 #include "window.h"
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
59 #include "line-number.h"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
61 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
62 #include "mule-coding.h"
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"
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
67 #endif
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
68
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 /* Note: We have to be careful throughout this code to properly handle
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 and differentiate between Bufbytes and Emchars.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 Since strings are generally composed of Bufbytes, I've taken the tack
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 that any contiguous set of Bufbytes is called a "string", while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 any contiguous set of Emchars is called an "array". */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 /* Return value to indicate a failure by an add_*_rune routine to add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 a rune, but no propagation information needs to be returned. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 #define ADD_FAILED (prop_block_dynarr *) 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 #define BEGIN_GLYPHS 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 #define END_GLYPHS 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 #define LEFT_GLYPHS 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 #define RIGHT_GLYPHS 3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 /* Set the vertical clip to 0 if we are currently updating the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 start cache. Otherwise for buffers of line height 1 it may fail to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 be able to work properly because regenerate_window will not layout
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 a single line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 #define VERTICAL_CLIP(w, display) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 (updating_line_start_cache \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 ? 0 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 : ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 ? INT_MAX \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 : vertical_clip))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 /* The following structures are completely private to redisplay.c so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 we put them here instead of in a header file, for modularity. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 /* NOTE: Bytinds not Bufpos's in this structure. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 typedef struct position_redisplay_data_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 /* This information is normally filled in by the create_*_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 routines and is used by the add_*_rune routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 Emchar ch; /* Character that is to be added. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 used to communicate this information to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 add_emchar_rune(). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 Lisp_Object last_charset; /* The charset of the previous character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 Used to optimize some lookups -- we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 only have to do some things when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 the charset changes. */
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
116 face_index last_findex; /* The face index of the previous character.
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
117 Needed to ensure the validity of the
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
118 last_charset optimization. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
119
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 int last_char_width; /* The width of the previous character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 int font_is_bogus; /* If true, it means we couldn't instantiate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 the font for this charset, so we substitute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 ~'s from the ASCII charset. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 Bytind bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 Bytind bi_endpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 int pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 int max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 int blank_width; /* Width of the blank that is to be added.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 This is used to communicate this information
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 to add_blank_rune().
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 This is also used rather cheesily to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 communicate the width of the eol-cursor-size
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 blank that exists at the end of the line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 add_emchar_rune() is called cheesily with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 the non-printing char '\n', which is stuck
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 in the output routines with its width being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 BLANK_WIDTH. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 Bytind bi_cursor_bufpos;/* This stores the buffer position of the cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 unsigned int cursor_type :3;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 int cursor_x; /* rune block cursor is at */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 int start_col; /* Number of character columns (each column has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 a width of the default char width) that still
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 need to be skipped. This is used for horizontal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 scrolling, where a certain number of columns
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 (those off the left side of the screen) need
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 to be skipped before anything is displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 Bytind bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
150 int hscroll_glyph_width_adjust; /* how much the width of the hscroll
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
151 glyph differs from space_width (w).
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
152 0 if no hscroll glyph was used,
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
153 i.e. the window is not scrolled
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
154 horizontally. Used in tab
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
155 calculations. */
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
156
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 /* Information about the face the text should be displayed in and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 any begin-glyphs and end-glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 struct extent_fragment *ef;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 face_index findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 /* 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
163 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
164 line ascent and descent values end up being, based just on font
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 information. In the first case we can immediately update the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 values, thus their inclusion here. In the last case we cannot
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 determine the actual contribution to the line height until we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 have finished laying out all text on the line. Thus we propagate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 the max height of such pixmaps and do a final calculation after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 all text has been added to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 int new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 int new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 int max_pixmap_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 Lisp_Object result_str; /* String where we put the result of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 generating a formatted string in the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 int is_modeline; /* Non-zero if we're generating the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 Charcount modeline_charpos; /* Number of chars used in result_str so far;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 corresponds to bytepos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 Bytecount bytepos; /* Number of bytes used in result_str so far.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 We don't actually copy the bytes into result_str
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 until the end because we don't know how big the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 string is going to be until then. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 } pos_data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 enum prop_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 PROP_STRING,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 PROP_CHAR,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 PROP_MINIBUF_PROMPT,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 PROP_BLANK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 /* Data that should be propagated to the next line. Either a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 Emchar or a string of Bufbyte's.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 The actual data that is propagated ends up as a Dynarr of these
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 blocks.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 #### It's unclean that both Emchars and Bufbytes are here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
203 typedef struct prop_block prop_block;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 struct prop_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 enum prop_type type;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
207
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 union data
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 struct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 Bufbyte *str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 Bytecount len; /* length of the string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 } p_string;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
215
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 struct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 Emchar ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 Bytind bi_cursor_bufpos; /* NOTE: is in Bytinds */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 unsigned int cursor_type :3;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 } p_char;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
222
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 struct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 face_index findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 } p_blank;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 } data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
231 typedef struct
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
233 Dynarr_declare (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 } prop_block_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 * Prototypes for all functions defined in redisplay.c.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 struct display_block *get_display_block_from_line (struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 enum display_type type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 layout_bounds calculate_display_line_boundaries (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 int modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 static Bufpos generate_display_line (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 int bounds, Bufpos start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 int start_col, prop_block_dynarr **prop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 static void generate_modeline (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 static int ensure_modeline_generated (struct window *w, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 static void generate_formatted_string_db (Lisp_Object format_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 Lisp_Object result_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 face_index findex, int min_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 int max_pixpos, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 Charcount pos, Charcount min_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 Charcount max_pos, Lisp_Object elt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 int depth, int max_pixsize,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 face_index findex, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 static prop_block_dynarr *add_emchar_rune (pos_data *data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 static prop_block_dynarr *add_bufbyte_string_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 Bufbyte *c_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 Bytecount c_length,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 int no_prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 static prop_block_dynarr *add_blank_rune (pos_data *data, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 int char_tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 static prop_block_dynarr *add_octal_runes (pos_data *data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 static prop_block_dynarr *add_control_char_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 struct buffer *b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 static prop_block_dynarr *add_disp_table_entry_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 Lisp_Object entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 static prop_block_dynarr *add_propagation_runes (prop_block_dynarr **prop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 pos_data *data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 static prop_block_dynarr *add_glyph_rune (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 struct glyph_block *gb,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 int pos_type, int allow_cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 struct glyph_cachel *cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 static prop_block_dynarr *add_glyph_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 int pos_type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 /* NOTE: Bytinds not Bufpos's here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 static Bytind create_text_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 Bytind bi_start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 prop_block_dynarr **prop, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 static int create_overlay_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 static void create_left_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 int overlay_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 static void create_right_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 static void regenerate_window (struct window *w, Bufpos start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 Bufpos point, int type);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
296 static Bufpos regenerate_window_point_center (struct window *w, Bufpos point,
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
297 int type);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 int window_half_pixpos (struct window *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 int line_at_center (struct window *w, int type, Bufpos start, Bufpos point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 Bufpos point_at_center (struct window *w, int type, Bufpos start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 Bufpos point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 static void redisplay_window (Lisp_Object window, int skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 static void redisplay_windows (Lisp_Object window, int skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 static int redisplay_frame (struct frame *f, int preemption_check);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 void redisplay (void);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 static void decode_mode_spec (struct window *w, Emchar spec, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 static void free_display_line (struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 void free_display_structs (struct window_mirror *mir);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 static int point_visible (struct window *w, Bufpos point, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 static void update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 Bufpos point, int no_regen);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 static Bufpos line_start_cache_start (struct window *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 static Bufpos line_start_cache_end (struct window *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 /* This used to be 10 but 30 seems to give much better performance. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 #define INIT_MAX_PREEMPTS 30
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 static int max_preempts;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 #define REDISPLAY_PREEMPTION_CHECK \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 preempted = 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 if (!disable_preemption && \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro))) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 if (!INTERACTIVE || detect_input_pending ()) { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 preempted = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 * Redisplay global variables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 /* We need a third set of display structures for the cursor motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 routines. We used to just give each window a third set. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 we always fully regenerate the structures when needed so there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 isn't any reason we need more than a single set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 display_line_dynarr *cmotion_display_lines;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 /* Used by generate_formatted_string. Global because they get used so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 much that the dynamic allocation time adds up. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
341 Emchar_dynarr *formatted_string_emchar_dynarr;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 struct display_line formatted_string_display_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 /* 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
344 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
345 this way rather than adding them as we generate the string because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 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
347 (to avoid having to resize the string multiple times), and we don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 want to go around adding extents to a string when the extents might
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 stretch off the end of the string. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
350 EXTENT_dynarr *formatted_string_extent_dynarr;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
351 Bytecount_dynarr *formatted_string_extent_start_dynarr;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
352 Bytecount_dynarr *formatted_string_extent_end_dynarr;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 /* #### probably temporary */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 int cache_adjustment;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 /* This holds a string representing the text corresponding to a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 modeline % spec. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
360 static Bufbyte_dynarr *mode_spec_bufbyte_string;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 int in_display; /* 1 if in redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 int disable_preemption; /* Used for debugging redisplay and for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 force-redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 /* We only allow max_preempts preemptions before we force a redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 static int preemption_count;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 /* Minimum pixel height of clipped bottom display line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 int vertical_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 /* Minimum visible pixel width of clipped glyphs at right margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 int horizontal_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 /* Set if currently inside update_line_start_cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 int updating_line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 /* Nonzero means reading single-character input with prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 so put cursor on minibuffer after the prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 int cursor_in_echo_area;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 Lisp_Object Qcursor_in_echo_area;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 /* Nonzero means truncate lines in all windows less wide than the frame */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 int truncate_partial_width_windows;
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 a buffer has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 int buffers_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 int buffers_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 /* non-nil if hscroll has changed somewhere or a buffer has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 narrowed or widened */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 int clip_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 int clip_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 /* non-nil if any extent has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 int extents_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 int extents_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 /* non-nil if any face has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 int faces_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 /* Nonzero means some frames have been marked as garbaged */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 int frame_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
406 /* This variable is 1 if the icon has to be updated.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 It is set to 1 when `frame-icon-glyph' changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 int icon_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 int icon_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
411 /* This variable is 1 if the menubar widget has to be updated.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 It is set to 1 by set-menubar-dirty-flag and cleared when the widget
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 has been indapted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 /* indapted???? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 int menubar_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 int menubar_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 /* true iff we should redraw the modelines on the next redisplay */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 int modeline_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 int modeline_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 /* non-nil if point has changed in some buffer since the last time
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 int point_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 int point_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 /* non-nil if some frame has changed its size */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 int size_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 /* non-nil if some device has signaled that it wants to change size */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 int asynch_device_change_pending;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 /* non-nil if any toolbar has changed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 int toolbar_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 int toolbar_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 /* non-nil if any window has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 int windows_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
440 /* 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
441 time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 int windows_structure_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 /* If non-nil, use vertical bar cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 Lisp_Object Vbar_cursor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 Lisp_Object Qbar_cursor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 int visible_bell; /* If true and the terminal will support it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 then the frame will flash instead of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 beeping when an error occurs */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 /* Nonzero means no need to redraw the entire frame on resuming
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 a suspended Emacs. This is useful on terminals with multiple pages,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 where one page is used for Emacs and another for all else. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 int no_redraw_on_reenter;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 under which emacs is running
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 ('x is the only current possibility) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 Lisp_Object Vinitial_window_system;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 Lisp_Object Vglobal_mode_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
465 /* 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
466 it is <=0 then point is centered in the window */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 int scroll_step;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
469 /* Scroll up to this many lines, to bring point back on screen. */
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
470 int scroll_conservatively;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
471
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 /* Marker for where to display an arrow on top of the buffer text. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 Lisp_Object Voverlay_arrow_position;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 /* String to display for the arrow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 Lisp_Object Voverlay_arrow_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 Lisp_Object Vwindow_size_change_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 #define INHIBIT_REDISPLAY_HOOKS /* #### Until we've thought about
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 this more. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 /* #### Chuck says: I think this needs more thought.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 Think about this for 19.14. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
488 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 int last_display_warning_tick, display_warning_tick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 Lisp_Object Qdisplay_warning_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 int inhibit_warning_display;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 Lisp_Object Vleft_margin_width, Vright_margin_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 Lisp_Object Vtext_cursor_visible_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
499 int column_number_start_at_one;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 /* low-level interfaces onto device routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 redisplay_text_width_emchar_string (struct window *w, int findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 Emchar *str, Charcount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 unsigned char charsets[NUM_LEADING_BYTES];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 find_charsets_in_emchar_string (charsets, str, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 charsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 text_width, (WINDOW_FACE_CACHEL (w, findex),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 str, len));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
523 static Emchar_dynarr *rtw_emchar_dynarr;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 redisplay_text_width_string (struct window *w, int findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 Bytecount offset, Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 if (!rtw_emchar_dynarr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 rtw_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 Dynarr_reset (rtw_emchar_dynarr);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
533
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 fixup_internal_substring (nonreloc, reloc, offset, &len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 if (STRINGP (reloc))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
536 nonreloc = XSTRING_DATA (reloc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 return redisplay_text_width_emchar_string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 (w, findex, Dynarr_atp (rtw_emchar_dynarr, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 Dynarr_length (rtw_emchar_dynarr));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 Bytecount offset, Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 unsigned char charsets[NUM_LEADING_BYTES];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 Lisp_Object frame = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 struct face_cachel cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 if (!rtw_emchar_dynarr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 rtw_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 Dynarr_reset (rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 fixup_internal_substring (nonreloc, reloc, offset, &len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 if (STRINGP (reloc))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
558 nonreloc = XSTRING_DATA (reloc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 find_charsets_in_bufbyte_string (charsets, nonreloc, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 reset_face_cachel (&cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 cachel.face = face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 XSETFRAME (frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 ensure_face_cachel_complete (&cachel, frame, charsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 text_width, (&cachel, Dynarr_atp (rtw_emchar_dynarr, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 Dynarr_length (rtw_emchar_dynarr)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 /* Return the display block from DL of the given TYPE. A display line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 can have only one display block of each possible type. If DL does
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 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
573
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 struct display_block *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 get_display_block_from_line (struct display_line *dl, enum display_type type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 struct display_block db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 /* 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
581 if so, return it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 if (Dynarr_at (dl->display_blocks, elt).type == type)
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
587 return Dynarr_atp (dl->display_blocks, elt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 /* There isn't an active block of the desired type, but there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 might still be allocated blocks we need to reuse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 if (elt < Dynarr_largest (dl->display_blocks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 /* 'add' the block to the list */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 Dynarr_increment (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 /* initialize and return */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 dbp->type = type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 return dbp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 /* This line doesn't have any display blocks, so initialize the display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 bock array. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
608 dl->display_blocks = Dynarr_new (display_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 /* 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
612 one and add it to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 memset (&db, 0, sizeof (struct display_block));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 db.type = type;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
615 db.runes = Dynarr_new (rune);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 Dynarr_add (dl->display_blocks, db);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 /* Return the newly added display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 elt = Dynarr_length (dl->display_blocks) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 return Dynarr_atp (dl->display_blocks, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 tab_char_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 int char_tab_width = XINT (b->tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 return char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 space_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 /* While tabs are traditional composed of spaces, for variable-width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 fonts the space character tends to give too narrow a value. So
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 we use 'n' instead. Except that we don't. We use the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 character width for the default face. If this is actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 defined by the font then it is probably the best thing to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 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
644 already calculated its width. Thus we can avoid a call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 XTextWidth on X frames by just querying the default width. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 return XFONT_INSTANCE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 tab_pix_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
653 return space_width (w) * tab_char_width (w);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 /* Given a pixel position in a window, return the pixel location of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 the next tabstop. Tabs are calculated from the left window edge in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 terms of spaces displayed in the default face. Formerly the space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 width was determined using the currently active face. That method
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 leads to tabstops which do not line up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 int n_pos = left_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 int pix_tab_width = tab_pix_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 /* Adjust n_pos for any hscrolling which has happened. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 if (w->hscroll > 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 n_pos -= space_width (w) * (w->hscroll - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 while (n_pos <= start_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 n_pos += pix_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 return n_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 /* For the given window, calculate the outside and margin boundaries for a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 display line. The whitespace boundaries must be calculated by the text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 layout routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 layout_bounds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 calculate_display_line_boundaries (struct window *w, int modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 layout_bounds bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 /* Set the outermost boundaries which are the boundaries of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 window itself minus the gutters (and minus the scrollbars if this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 is for the modeline). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 if (!modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 bounds.left_out = WINDOW_TEXT_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 bounds.right_out = WINDOW_TEXT_RIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 bounds.left_out = WINDOW_MODELINE_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 /* The inner boundaries mark where the glyph margins are located. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 bounds.left_in = bounds.left_out + window_left_margin_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 bounds.right_in = bounds.right_out - window_right_margin_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 /* We cannot fully calculate the whitespace boundaries as they
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 depend on the contents of the line being displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 bounds.left_white = bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 bounds.right_white = bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 return bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 /* Given a display line and a starting position, ensure that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 contents of the display line accurately represent the visual
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 representation of the buffer contents starting from the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 position when displayed in the given window. The display line ends
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 when the contents of the line reach the right boundary of the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 generate_display_line (struct window *w, struct display_line *dl, int bounds,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 Bufpos start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 prop_block_dynarr **prop, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 Bufpos ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 int overlay_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 /* If our caller hasn't already set the boundaries, then do so now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 if (!bounds)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 dl->bounds = calculate_display_line_boundaries (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 /* Reset what this line is using. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 Dynarr_reset (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 if (dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 Dynarr_free (dl->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 dl->left_glyphs = 0;
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 (dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 Dynarr_free (dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 dl->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 /* We aren't generating a modeline at the moment. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 dl->modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 /* Create a display block for the text region of the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752 /* #### urk urk urk!!! Chuck fix this shit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 Bytind hacked_up_bytind =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 create_text_block (w, dl, bufpos_to_bytind (b, start_pos),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 start_col, prop, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756 if (hacked_up_bytind > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 ret_bufpos = BUF_ZV (b) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759 ret_bufpos = bytind_to_bufpos (b, hacked_up_bytind);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 dl->bufpos = start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 if (dl->end_bufpos < dl->bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 dl->end_bufpos = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 if (MARKERP (Voverlay_arrow_position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 && start_pos == marker_position (Voverlay_arrow_position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 && (STRINGP (Voverlay_arrow_string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 || GLYPHP (Voverlay_arrow_string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 overlay_width = create_overlay_glyph_block (w, dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 overlay_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 /* If there are left glyphs associated with any character in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 text block, then create a display block to handle them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 create_left_glyph_block (w, dl, overlay_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 /* If there are right glyphs associated with any character in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 text block, then create a display block to handle them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 create_right_glyph_block (w, dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 /* In the future additional types of display blocks may be generated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789 w->last_redisplay_pos = ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 return ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 /* Adds an hscroll glyph to a display block. If this is called, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 the block had better be empty.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 Yes, there are multiple places where this function is called but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 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
799 with bi_start_col_enabled a little differently depending on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 object being worked with. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 add_hscroll_rune (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 Bytind bi_old_bufpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 if (data->cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 && data->bi_cursor_bufpos >= data->bi_start_col_enabled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 && data->bi_cursor_bufpos <= data->bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 data->bi_cursor_bufpos = data->bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 data->cursor_type = NO_CURSOR;
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 data->bi_endpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 data->bi_bufpos = data->bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 gb.glyph = Vhscroll_glyph;
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
827 {
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
828 int oldpixpos = data->pixpos;
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
829 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
830 GLYPH_CACHEL (XWINDOW (data->window),
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
831 HSCROLL_GLYPH_INDEX));
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
832 data->hscroll_glyph_width_adjust =
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
833 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
834 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 data->bi_endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 data->bi_bufpos = bi_old_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 data->bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 /* Adds a character rune to a display block. If there is not enough
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 room to fit the rune on the display block (as determined by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 MAX_PIXPOS) then it adds nothing and returns ADD_FAILED. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 add_emchar_rune (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 struct rune rb, *crb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 int width, local;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 return add_hscroll_rune (data);
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 if (data->ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 data->font_is_bogus = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 /* Cheesy end-of-line pseudo-character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 Lisp_Object charset = CHAR_CHARSET (data->ch);
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
876 if (!EQ (charset, data->last_charset) ||
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
877 data->findex != data->last_findex)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 /* OK, we need to do things the hard way. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 struct window *w = XWINDOW (data->window);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
881 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 Lisp_Object font_instance =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 ensure_face_cachel_contains_charset (cachel, data->window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 charset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 struct Lisp_Font_Instance *fi;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 if (EQ (font_instance, Vthe_null_font_instance))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 data->font_is_bogus = 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 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 data->font_is_bogus = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 fi = XFONT_INSTANCE (font_instance);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 if (!fi->proportional_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 /* sweetness and light. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 data->last_char_width = fi->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 data->last_char_width = -1;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
901 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 data->new_descent = max (data->new_descent, (int) fi->descent);
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
903 data->last_charset = charset;
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
904 data->last_findex = data->findex;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 width = data->last_char_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 if (width < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 /* bummer. Proportional fonts. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 width = redisplay_text_width_emchar_string (XWINDOW (data->window),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 data->findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 &data->ch, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 local = 0;
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 crb = &rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 local = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 crb->findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 crb->xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 crb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 if (data->bi_bufpos)
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
937 crb->bufpos =
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
938 bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
939 data->bi_bufpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 else if (data->is_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 crb->bufpos = data->modeline_charpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 /* fuckme if this shouldn't be an abort. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 /* abort (); fuckme harder, this abort gets tripped quite often,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 in propagation and whatnot. #### fixme */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 crb->bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 crb->type = RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 crb->endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 crb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 crb->cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 crb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 else if (data->cursor_type == IGNORE_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 crb->cursor_type = IGNORE_CURSOR;
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 crb->cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 if (local)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 Dynarr_add (data->db->runes, *crb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 Dynarr_increment (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 data->pixpos += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 /* Given a string C_STRING of length C_LENGTH, call add_emchar_rune
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 for each character in the string. Propagate any left-over data
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 unless NO_PROP is non-zero. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 add_bufbyte_string_runes (pos_data *data, Bufbyte *c_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 Bytecount c_length, int no_prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 Bufbyte *pos, *end = c_string + c_length;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 /* #### This function is too simplistic. It needs to do the same
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 sort of character interpretation (display-table lookup,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 ctl-arrow checking), etc. that create_text_block() does.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 The functionality to do this in that routine needs to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 modularized. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
998
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 for (pos = c_string; pos < end;)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 data->ch = charptr_emchar (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 if (prop)
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 (no_prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 Bytecount len = end - pos;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1013 prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 pb.type = PROP_STRING;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1016 pb.data.p_string.str = xnew_array (Bufbyte, len);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 pb.data.p_string.len = len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 INC_CHARPTR (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 assert (pos <= end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 /* Add a single rune of the specified width. The area covered by this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 rune will be displayed in the foreground color of the associated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 /* 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
1041 been to add it as a tab. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 /* assert (w != NULL) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 /* If we have still not fully scrolled horizontally, subtract
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 the width of this tab and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 if (char_tab_width < data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 data->start_col -= char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 else if (char_tab_width == data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 data->blank_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 int spcwid = space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 if (spcwid >= data->blank_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 data->blank_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 data->blank_width -= spcwid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
1065
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 data->start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 /* Could be caused by the handling of the hscroll rune. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 if (retval != NULL || !data->blank_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 /* Blank runes are always calculated to fit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 assert (data->pixpos + data->blank_width <= data->max_pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 rb.findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 rb.xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 rb.width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 if (data->bi_bufpos)
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1081 rb.bufpos =
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1082 bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1083 data->bi_bufpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 /* #### and this is really correct too? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 rb.bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 rb.type = RUNE_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 Dynarr_add (data->db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 data->pixpos += data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 /* Add runes representing a character in octal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 if (add_failed || (add_failed = add_emchar_rune (data))) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 struct prop_block pb; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 if (!prop) \
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1123 prop = Dynarr_new (prop_block); \
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 pb.type = PROP_CHAR; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 pb.data.p_char.ch = data->ch; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 pb.data.p_char.cursor_type = data->cursor_type; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 Dynarr_add (prop, pb); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 add_octal_runes (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 prop_block_dynarr *prop, *add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 Emchar orig_char = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 unsigned int orig_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 /* Initialize */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 add_failed = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 if (!data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 add_failed = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 gb.glyph = Voctal_escape_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 add_failed =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 /* We only propagate information if the glyph was partially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 added. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 return add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 if (data->ch >= 0x100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 /* If the character is an extended Mule character, it could have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 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
1176 octal number. This is not that pretty, but whatever. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 data->ch = (7 & (orig_char >> 18)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 data->ch = (7 & (orig_char >> 15)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 data->ch = (7 & (orig_char >> 12)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 data->ch = (7 & (orig_char >> 9)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 data->ch = (7 & (orig_char >> 6)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 data->ch = (7 & (orig_char >> 3)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 data->ch = (7 & orig_char) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 data->cursor_type = orig_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 #undef ADD_NEXT_OCTAL_RUNE_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 /* Add runes representing a control character to a display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 add_control_char_runes (pos_data *data, struct buffer *b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 if (!NILP (b->ctl_arrow))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 Emchar orig_char = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 /* Initialize */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 if (!data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 if (retval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 gb.glyph = Vcontrol_arrow_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 /* We only propagate information if the glyph was partially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 added. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 if (orig_char == 0177)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 data->ch = '?';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 data->ch = orig_char ^ 0100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 if (add_emchar_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 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 if (!prop)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1258 prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 pb.type = PROP_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 pb.data.p_char.ch = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 pb.data.p_char.cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 return add_octal_runes (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 /* Given a display table entry, call the appropriate functions to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 display each element of the entry. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 if (VECTORP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285 struct Lisp_Vector *de = XVECTOR (entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 long len = vector_length (de);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 for (elt = 0; elt < len; elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 if (NILP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 else if (STRINGP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 prop =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 add_bufbyte_string_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297 (data,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1298 XSTRING_DATA (de->contents[elt]),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1299 XSTRING_LENGTH (de->contents[elt]),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302 else if (GLYPHP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 if (!data->start_col && data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 prop = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 gb.glyph = de->contents[elt];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320 else if (CHAR_OR_CHAR_INTP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 data->ch = XCHAR_OR_CHAR_INT (de->contents[elt]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 /* Else blow it off because someone added a bad entry and we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326 don't have any safe way of signaling an error. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 /* #### Still need to add any remaining elements to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329 propagation information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334 else if (STRINGP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 prop = add_bufbyte_string_runes (data,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1337 XSTRING_DATA (entry),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1338 XSTRING_LENGTH (entry),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 else if (GLYPHP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 if (!data->start_col && data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 prop = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 gb.glyph = entry;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 else if (CHAR_OR_CHAR_INTP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 data->ch = XCHAR_OR_CHAR_INT (entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 /* Else blow it off because someone added a bad entry and we don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 have any safe way of signaling an error. Hey, this comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 sounds familiar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 /* Add runes which were propagated from the previous line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 /* #### Remember to handle start_col parameter of data when the rest of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 this is finished. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378 /* #### Chuck -- I've redone this function a bit. It looked like the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 case of not all the propagation blocks being added was not handled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 well. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 /* #### Chuck -- I also think the double indirection of PROP is kind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 of bogus. A cleaner solution is just to check for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 Dynarr_length (prop) > 0. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 /* #### This function also doesn't even pay attention to ADD_FAILED!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 This is seriously fucked! Seven ####'s in 130 lines -- is that a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 record? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 prop_block_dynarr *add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 for (elt = 0; elt < Dynarr_length (*prop); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 struct prop_block *pb = Dynarr_atp (*prop, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 switch (pb->type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 case PROP_CHAR:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 data->ch = pb->data.p_char.ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 data->bi_cursor_bufpos = pb->data.p_char.bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 data->cursor_type = pb->data.p_char.cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402 add_failed = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 case PROP_STRING:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 if (pb->data.p_string.str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409 xfree (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 /* #### bogus bogus -- this doesn't do anything!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 Should probably call add_bufbyte_string_runes(),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 once that function is fixed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 case PROP_MINIBUF_PROMPT:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 Bytind bi_old_bufpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 data->findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 data->bi_bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 while (pb->data.p_string.len > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425 data->ch = charptr_emchar (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 add_failed = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 data->bi_bufpos = bi_old_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 /* Complicated equivalent of ptr++, len-- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 Bufbyte *oldpos = pb->data.p_string.str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 INC_CHARPTR (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 /* ##### FIXME FIXME FIXME -- Upon successful return from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 this function, data->bi_bufpos is automatically incremented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 However, we don't want that to happen if we were adding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 the minibuffer prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 struct buffer *buf =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 /* #### Chuck fix this shit or I'm gonna scream! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 if (bi_old_bufpos > BI_BUF_BEGV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 data->bi_bufpos = prev_bytind (buf, bi_old_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 /* #### is this correct? Does anyone know?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 Does anyone care? Is this a cheesy hack or what? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 data->bi_bufpos = BI_BUF_BEGV (buf) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 case PROP_BLANK:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 /* #### I think it's unnecessary and misleading to preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 the blank_width, as it implies that the value carries
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 over from one rune to the next, which is wrong. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 int old_width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 data->findex = pb->data.p_blank.findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 data->blank_width = pb->data.p_blank.width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 data->bi_cursor_bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 if (data->pixpos + data->blank_width > data->max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 data->blank_width = data->max_pixpos - data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 /* We pass a bogus value of char_tab_width. It shouldn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 matter because unless something is really screwed up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 this call won't cause that arg to be used. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 /* This can happen in the case where we have a tab which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 is wider than the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 if (data->blank_width != pb->data.p_blank.width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 pb->data.p_blank.width -= data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 add_failed = ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 data->blank_width = old_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 default:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 oops_no_more_space:
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
1503
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 if (elt < Dynarr_length (*prop))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 Dynarr_delete_many (*prop, 0, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 return *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 /* Add 'text layout glyphs at position POS_TYPE that are contained to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 the display block, but add all other types to the appropriate list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 of the display line. They will be added later by different
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 int allow_cursor, struct glyph_cachel *cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 /* A nil extent indicates a special glyph (ex. truncator). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 if (NILP (gb->extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 || (pos_type == BEGIN_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 || (pos_type == END_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 int xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 int ascent, descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 Lisp_Object baseline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 if (cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 width = cachel->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 width = glyph_width (gb->glyph, Qnil, data->findex, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548 if (!width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 int glyph_char_width = width / space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 /* If we still have not fully scrolled horizontally after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 taking into account the width of the glyph, subtract its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 width and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 if (glyph_char_width < data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 data->start_col -= glyph_char_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 else if (glyph_char_width == data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 xoffset = space_width (w) * data->start_col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 width -= xoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 /* #### Can this happen? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 if (width < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576 data->start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579 /* Could be caused by the handling of the hscroll rune. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 if (retval != NULL || !width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586 if (data->pixpos + width > data->max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588 /* If this is the first object we are attempting to add to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 the line then we ignore the horizontal_clip threshold.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 Otherwise we will loop until the bottom of the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 continually failing to add this glyph because it is wider
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 than the window. We could alternatively just completely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 ignore the glyph and proceed from there but I think that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 this is a better solution. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 if (Dynarr_length (data->db->runes)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 && data->max_pixpos - data->pixpos < horizontal_clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599 width = data->max_pixpos - data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 if (cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 ascent = cachel->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605 descent = cachel->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 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 ascent = glyph_ascent (gb->glyph, Qnil, data->findex, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 descent = glyph_descent (gb->glyph, Qnil, data->findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 baseline = glyph_baseline (gb->glyph, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 if (glyph_contrib_p (gb->glyph, data->window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 /* A pixmap that has not had a baseline explicitly set. Its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 contribution will be determined later. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620 if (NILP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623 data->max_pixmap_height = max (data->max_pixmap_height, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626 /* A string so determine contribution normally. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 else if (EQ (baseline, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 data->new_ascent = max (data->new_ascent, ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630 data->new_descent = max (data->new_descent, descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 /* A pixmap with an explicitly set baseline. We determine the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 contribution here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 else if (INTP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1637 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 pix_ascent = height * XINT (baseline) / 100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 pix_descent = height - pix_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 data->new_ascent = max (data->new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 data->new_descent = max (data->new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647 /* Otherwise something is screwed up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1651
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 face = glyph_face (gb->glyph, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653 if (NILP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 rb.findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1655 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1656 rb.findex = get_builtin_face_cache_index (w, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1657
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 rb.xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 rb.width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660 rb.bufpos = 0; /* glyphs are never "at" anywhere */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 if (data->bi_endpos)
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1662 /* #### is this necessary at all? */
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1663 rb.endpos = bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (w)),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1664 data->bi_endpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 rb.type = RUNE_DGLYPH;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 /* #### Ben sez: this is way bogus if the glyph is a string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 You should not make the output routines have to cope with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 this. The string could contain Mule characters, or non-
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671 printable characters, or characters to be passed through
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 the display table, or non-character objects (when this gets
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673 implemented), etc. Instead, this routine here should parse
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 the string into a series of runes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 rb.object.dglyph.glyph = gb->glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 rb.object.dglyph.extent = gb->extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 rb.object.dglyph.xoffset = xoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 if (allow_cursor)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680 {
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1681 rb.bufpos = bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (w)),
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 227
diff changeset
1682 data->bi_bufpos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1693 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 else if (data->cursor_type == IGNORE_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 rb.cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702 else if (data->cursor_type == NO_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 rb.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 Dynarr_add (data->db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711 data->pixpos += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 if (!NILP (glyph_face (gb->glyph, data->window)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 gb->findex =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 gb->findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 if (pos_type == BEGIN_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 if (!data->dl->left_glyphs)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1727 data->dl->left_glyphs = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 Dynarr_add (data->dl->left_glyphs, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 else if (pos_type == END_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 if (!data->dl->right_glyphs)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
1734 data->dl->right_glyphs = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735 Dynarr_add (data->dl->right_glyphs, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 abort (); /* there are no unknown types */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 return NULL; /* shut up compiler */
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 /* Add all glyphs at position POS_TYPE that are contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746 data. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 add_glyph_runes (pos_data *data, int pos_type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 why didn't you just modify add_glyph_rune in the first place? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 ? data->ef->begin_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756 : data->ef->end_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766 /* #### Add some propagation information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771 Dynarr_reset (glyph_arr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 /* Given a position for a buffer in a window, ensure that the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777 display line DL accurately represents the text on a line starting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778 at the given position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 NOTE NOTE NOTE NOTE: This function works with and returns Bytinds.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 You must do appropriate conversion. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 static Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784 create_text_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 Bytind bi_start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 prop_block_dynarr **prop, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 pos_data data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 struct Lisp_Vector *dt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1794
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 /* Don't display anything in the minibuffer if this window is not on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 a selected frame. We consider all other windows to be active
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 minibuffers as it simplifies the coding. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 int active_minibuffer = (!MINI_WINDOW_P (w) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 (f == device_selected_frame (d)) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 is_surrogate_for_selected_frame (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 int truncate_win = window_truncation_on (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 int end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 /* If the buffer's value of selective_display is an integer then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 only lines that start with less than selective_display columns of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 space will be displayed. If selective_display is t then all text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 after a ^M is invisible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 int selective = (INTP (b->selective_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 ? XINT (b->selective_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 : ((!NILP (b->selective_display) ? -1 : 0)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 /* The variable ctl-arrow allows the user to specify what characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 can actually be displayed and which octal should be used for.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 #### This variable should probably have some rethought done to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 #### It would also be really nice if you could specify that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 the characters come out in hex instead of in octal. Mule
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1820 does that by adding a ctl-hexa variable similar to ctl-arrow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 but that's bogus -- we need a more general solution. I
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 think you need to extend the concept of display tables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823 into a more general conversion mechanism. Ideally you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824 could specify a Lisp function that converts characters,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 but this violates the Second Golden Rule and besides would
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 make things way way way way slow. An idea I like is to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 be able to specify multiple display tables instead of just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828 one. Each display table can specify conversions for some
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829 characters and leave others unchanged. The way the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 character gets displayed is determined by the first display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831 table with a binding for that character. This way, you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832 could call a function `enable-hex-display' that adds a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833 pre-defined hex display-table (or maybe computes one if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834 you give weird parameters to the function) and adds it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 to the list of display tables for the current buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837 Unfortunately there are still problems dealing with Mule
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 characters. For example, maybe I want to specify that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839 all extended characters (i.e. >= 256) are displayed in hex.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840 It's not reasonable to create a mapping for all possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841 such characters, because there are about 2^19 of them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842 One way of dealing with this is to extend the concept
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843 of what a display table is. Currently it's only allowed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 to be a 256-entry vector. Instead, it should be something
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845 like:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 a) A 256-entry vector, for backward compatibility
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 b) Some sort of hashtable, mapping characters to values
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 c) A list that specifies a range of values and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 mapping to provide for those values.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852 Also, extend the concept of "mapping" to include a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 printf-like spec. Then, you could make all extended
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 characters show up as hex with a display table like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856 ((256 . 524288) . "%x")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 Since more than one display table is possible, you have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 great flexibility in mapping ranges of characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 Emchar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 ? 255 : 160));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 /* The text display block for this display line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 /* The first time through the main loop we need to force the glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 data to be updated. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871 int initial = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873 /* Apparently the new extent_fragment_update returns an end position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 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
1875 displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 int no_more_frags = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878 Lisp_Object synch_minibuffers_value =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
1880
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881 dl->used_prop_data = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 dl->num_chars = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884 memset (&data, 0, sizeof (data));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1885 data.ef = extent_fragment_new (w->buffer, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1887 /* These values are used by all of the rune addition routines. We add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1888 them to this structure for ease of passing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 data.db = db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1892 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 data.bi_bufpos = bi_start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 data.pixpos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 data.last_charset = Qunbound;
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
1897 data.last_findex = DEFAULT_INDEX;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 data.result_str = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900 /* Set the right boundary adjusting it to take into account any end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 glyph. Save the width of the end glyph for later use. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 data.max_pixpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
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 end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 data.max_pixpos -= end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 if (cursor_in_echo_area)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913 data.bi_cursor_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1918 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919 else if (MINI_WINDOW_P (w) && !active_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 data.cursor_type = NO_CURSOR;
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1921 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1922 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1923 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
1924 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926 data.bi_cursor_bufpos = BI_BUF_PT (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1930 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931 data.bi_cursor_bufpos = bi_marker_position (w->pointm[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1934 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 data.cursor_x = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 data.start_col = w->hscroll;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939 data.bi_start_col_enabled = (w->hscroll ? bi_start_pos : 0);
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
1940 data.hscroll_glyph_width_adjust = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942 /* We regenerate the line from the very beginning. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 /* 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
1946 starting position is already equal to the maximum we can't add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 anything else, right? Wrong. We might still have a newline to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 add. A newline can use the room allocated for an end glyph since
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 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
1950 glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952 /* #### Chuck -- I think this condition should be while (1).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 and the begin-glyph ends exactly at the end of the window, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 end-glyph and text might not be displayed. while (1) ensures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 that the loop terminates only when either (a) there is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 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
1958
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959 #### Also I think you need to ensure that the operation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960 "add begin glyphs; add end glyphs; add text" is atomic and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961 can't get interrupted in the middle. If you run off the end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 of the line during that operation, then you keep accumulating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 propagation data until you're done. Otherwise, if the (e.g.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 there's a begin glyph at a particular position and attempting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 to display that glyph results in window-end being hit and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 propagation data being generated, then the character at that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 position won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 #### See also the comment after the end of this loop, below.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971 while (data.pixpos <= data.max_pixpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972 && (active_minibuffer || !NILP (synch_minibuffers_value)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 /* #### This check probably should not be necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 if (data.bi_bufpos > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 /* #### urk! More of this lossage! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 data.bi_bufpos--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982 /* If selective display was an integer and we aren't working on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 a continuation line then find the next line we are actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984 supposed to display. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985 if (selective > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 && (data.bi_bufpos == BI_BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 || BUF_FETCH_CHAR (b, prev_bytind (b, data.bi_bufpos)) == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991 data.bi_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1992 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993 if (data.bi_bufpos >= BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995 data.bi_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001 /* Check for face changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 if (initial || (!no_more_frags && data.bi_bufpos == data.ef->end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004 /* Now compute the face and begin/end-glyph information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 data.findex =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 /* Remember that the extent-fragment routines deal in Bytind's. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007 extent_fragment_update (w, data.ef, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009 if (data.bi_bufpos == data.ef->end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010 no_more_frags = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 dt = get_display_table (w, data.findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2013 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2014 initial = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2015
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016 /* Determine what is next to be displayed. We first handle any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 glyphs returned by glyphs_at_bufpos. If there are no glyphs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 display then we determine what to do based on the character at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019 current buffer position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2021 /* If the current position is covered by an invisible extent, do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2022 nothing (except maybe add some ellipses).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 #### The behavior of begin and end-glyphs at the edge of an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 invisible extent should be investigated further. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026 fairly low priority though. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 if (data.ef->invisible)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 /* #### Chuck, perhaps you could look at this code? I don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 really know what I'm doing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 *prop = 0;
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 /* The extent fragment code only sets this when we should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038 really display the ellipses. It makes sure the ellipses
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 don't get displayed more than once in a row. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 if (data.ef->invisible_ellipses)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2041 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 data.ef->invisible_ellipses_already_displayed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 data.ef->invisible_ellipses = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2046 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 /* Perhaps they shouldn't propagate if the very next thing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 is to display a newline (for compatibility with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 selective-display-ellipses)? Maybe that's too
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053 abstruse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 /* If point is in an invisible region we place it on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 next visible character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061 && data.bi_bufpos == data.bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2063 data.cursor_type = NEXT_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 /* #### What if we we're dealing with a display table? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 if (data.start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068 data.start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070 if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 /* If there is propagation data, then it represents the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 buffer position being displayed. Add them and advance the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078 position counter. This might also add the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079 prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080 else if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082 dl->used_prop_data = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083 *prop = add_propagation_runes (prop, &data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086 goto done; /* gee, a really narrow window */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087 else if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089 else if (data.bi_bufpos < BI_BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091 data.bi_bufpos = BI_BUF_BEGV (b);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2092 else
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 /* If there are end glyphs, add them to the line. These are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097 the end glyphs for the previous run of text. We add them
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098 here rather than doing them at the end of handling the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099 previous run so that glyphs at the beginning and end of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100 a line are handled correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101 else if (Dynarr_length (data.ef->end_glyphs) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 *prop = add_glyph_runes (&data, END_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2105 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2107
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108 /* If there are begin glyphs, add them to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 /* If at end-of-buffer, we've already processed begin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 end-glyphs at this point and there's no text to process,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118 so we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119 else if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 /* Get the character at the current buffer position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 /* If there is a display table entry for it, hand it off to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128 add_disp_table_entry_runes and let it worry about it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 if (dt && !NILP (DISP_CHAR_ENTRY (dt, data.ch)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131 *prop =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 add_disp_table_entry_runes (&data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 DISP_CHAR_ENTRY (dt, data.ch));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139 /* Check if we have hit a newline character. If so, add a marker
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2140 to the line and end this loop. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141 else if (data.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143 /* We aren't going to be adding an end glyph so give its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 space back in order to make sure that the cursor can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145 fit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 if (selective > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149 && (bi_spaces_at_point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150 (b, next_bytind (b, data.bi_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2151 >= selective))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2152 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 if (!NILP (b->selective_display_ellipses))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2163 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 /* Cheesy, cheesy, cheesy. We mark the end of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165 line with a special "character rune" whose width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 is the EOL cursor width and whose character is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167 the non-printing character '\n'. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2169 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2170 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2172 /* We need to set data.bi_bufpos to the start of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 next visible region in order to make this line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174 appear to contain all of the invisible area.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175 Otherwise, the line cache won't work
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176 correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180 data.bi_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182 if (data.bi_bufpos >= BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184 data.bi_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186 }
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 (BI_BUF_FETCH_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189 (b, prev_bytind (b, data.bi_bufpos)) == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190 DEC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2192 else
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.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2195 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2196 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2197
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2198 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2199 }
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 the current character is ^M, and selective display is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2202 enabled, then add the invisible-text-glyph if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2203 selective-display-ellipses is set. In any case, this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2204 line is done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2205 else if (data.ch == (('M' & 037)) && selective == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2206 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2207 Bytind bi_next_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2208
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2209 /* Find the buffer position at the end of the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2210 bi_next_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2211 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2212 if (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_next_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2213 == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2214 DEC_BYTIND (b, bi_next_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2216 /* If the cursor is somewhere in the elided text make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2217 sure that the cursor gets drawn appropriately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2218 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2219 && (data.bi_cursor_bufpos >= data.bi_bufpos &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2220 data.bi_cursor_bufpos < bi_next_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2221 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2222 data.cursor_type = NEXT_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2223 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2225 /* We won't be adding a truncation or continuation glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2226 so give up the room allocated for them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2227 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2228
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2229 if (!NILP (b->selective_display_ellipses))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2230 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2231 /* We don't propagate anything from the invisible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2232 text glyph if it fails to fit. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2233 intentional. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2234 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2235
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2236 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2237 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2238 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2239 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
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 /* Set the buffer position to the end of the line. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2243 need to do this before potentially adding a newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2244 so that the cursor flag will get set correctly (if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2245 needed). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2246 data.bi_bufpos = bi_next_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2248 if (NILP (b->selective_display_ellipses)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2249 || data.bi_cursor_bufpos == bi_next_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2250 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2251 /* We have to at least add a newline character so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2252 that the cursor shows up properly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2253 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2254 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2255 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2256 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2257 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2259 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2260 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2262 /* This had better be a newline but doing it this way
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2263 we'll see obvious incorrect results if it isn't. No
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2264 need to abort here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2265 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2266
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2267 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2268 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2270 /* If the current character is considered to be printable, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2271 just add it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2272 else if (data.ch >= printable_min)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2273 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2274 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2275 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2276 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2277 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2278
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2279 /* If the current character is a tab, determine the next tab
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2280 starting position and add a blank rune which extends from the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2281 current pixel position to that starting position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2282 else if (data.ch == '\t')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2283 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2284 int tab_start_pixpos = data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2285 int next_tab_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2286 int char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2287 int prop_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2289 if (data.start_col > 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2290 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2291
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2292 next_tab_start =
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2293 next_tab_position (w, tab_start_pixpos,
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2294 dl->bounds.left_in +
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
2295 data.hscroll_glyph_width_adjust);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2296 if (next_tab_start > data.max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2297 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2298 prop_width = next_tab_start - data.max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2299 next_tab_start = data.max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2300 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2301 data.blank_width = next_tab_start - data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2302 char_tab_width =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2303 (next_tab_start - tab_start_pixpos) / space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2304
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2305 *prop = add_blank_rune (&data, w, char_tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2307 /* add_blank_rune is only supposed to be called with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2308 sizes guaranteed to fit in the available space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2309 assert (!(*prop));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2310
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2311 if (prop_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2312 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2313 struct prop_block pb;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2314 *prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2315
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2316 pb.type = PROP_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2317 pb.data.p_blank.width = prop_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2318 pb.data.p_blank.findex = data.findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2319 Dynarr_add (*prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2321 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2322 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2323 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2324
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2325 /* If character is a control character, pass it off to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2326 add_control_char_runes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2327
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2328 The is_*() routines have undefined results on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2329 arguments outside of the range [-1, 255]. (This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2330 often bites people who carelessly use `char' instead
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2331 of `unsigned char'.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2332 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2333 else if (data.ch < 0x100 && iscntrl ((Bufbyte) data.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2334 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2335 *prop = add_control_char_runes (&data, b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2337 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2338 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2339 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2340
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2341 /* If the character is above the ASCII range and we have not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2342 already handled it, then print it as an octal number. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2343 else if (data.ch >= 0200)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2344 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2345 *prop = add_octal_runes (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2346
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2347 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2348 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2349 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2351 /* Assume the current character is considered to be printable,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2352 then just add it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2353 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2354 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2355 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2356 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2357 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2358 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2360 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2361 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2362 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2363
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2364 done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2365
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2366 /* 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
2367 end of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2368 if (data.bi_bufpos < BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2369 && (active_minibuffer || !NILP (synch_minibuffers_value)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2370 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2371 /* #### This check is not correct. If the line terminated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2372 due to a begin-glyph or end-glyph hitting window-end, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2373 data.ch will not point to the character at data.bi_bufpos. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2374 you make the two changes mentioned at the top of this loop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2375 you should be able to say '(if (*prop))'. That should also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2376 make it possible to eliminate the data.bi_bufpos < BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2377 check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2379 /* The common case is that the line ended because we hit a newline.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2380 In that case, the next character is just the next buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2381 position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2382 if (data.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2383 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2384 /* If data.start_col_enabled is still true, then the window is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2385 scrolled far enough so that nothing on this line is visible.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2386 We need to stick a trunctation glyph at the beginning of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2387 line in that case unless the line is completely blank. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2388 if (data.bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2389 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2390 if (data.cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2391 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2392 if (data.bi_cursor_bufpos >= bi_start_pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2393 && data.bi_cursor_bufpos <= data.bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2394 data.bi_cursor_bufpos = data.bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2395 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2396 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2397 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2398 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2399
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2400 if (data.bi_bufpos != bi_start_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2401 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2402 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2404 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2405 gb.glyph = Vhscroll_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2406 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2407 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2408 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2409 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2410 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2411 /* This duplicates code down below to add a newline to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2412 the end of an otherwise empty line.*/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2413 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2414 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2415
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2416 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2417 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2418 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2419
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2420 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2421 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2423 /* Otherwise we have a buffer line which cannot fit on one display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2424 line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2425 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2426 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2427 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2428 struct glyph_cachel *cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2430 /* If the line is to be truncated then we actually have to look
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2431 for the next newline. We also add the end-of-line glyph which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2432 we know will fit because we adjusted the right border before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2433 we starting laying out the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2434 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2435 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2436 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2437
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2438 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2439 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2440 Bytind bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2441
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2442 /* Now find the start of the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2443 bi_pos = bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2445 /* If the cursor is past the truncation line then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2446 make it appear on the truncation glyph. If we've hit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2447 the end of the buffer then we also make the cursor
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
2448 appear unless eob is immediately preceded by a
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2449 newline. In that case the cursor should actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2450 appear on the next line. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2451 if (data.cursor_type == CURSOR_ON
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2452 && data.bi_cursor_bufpos >= data.bi_bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2453 && (data.bi_cursor_bufpos < bi_pos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2454 (bi_pos == BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2455 && (bi_pos == BI_BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2456 || (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2457 != '\n')))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2458 data.bi_cursor_bufpos = bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2459 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2460 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2462 data.bi_bufpos = bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2463 gb.glyph = Vtruncation_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2464 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2465 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2466 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2467 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2468 /* The cursor can never be on the continuation glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2469 data.cursor_type = NO_CURSOR;
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.bi_bufpos is already at the start of the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2472
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2473 gb.glyph = Vcontinuation_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2474 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2475 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2477 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1, cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2479 if (truncate_win && data.bi_bufpos == BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2480 && BI_BUF_FETCH_CHAR (b, prev_bytind (b, BI_BUF_ZV (b))) != '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2481 /* #### Damn this losing shit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2482 data.bi_bufpos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2483 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2484 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2485 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2486 && (!echo_area_active (f) || data.bi_bufpos == BI_BUF_ZV (b)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2487 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2488 /* 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
2489 newline character in order for the cursor to get drawn. We label
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2490 it as a newline so that it gets handled correctly by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2491 whitespace routines below. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2492
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2493 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2494 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2495 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2496 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2497 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2498
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2499 data.max_pixpos += data.blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2500 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2501 data.max_pixpos -= data.blank_width;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2502
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2503 /* #### urk! Chuck, this shit is bad news. Going around
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2504 manipulating invalid positions is guaranteed to result in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2505 trouble sooner or later. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2506 data.bi_bufpos = BI_BUF_ZV (b) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2507 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2508
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2509 /* Calculate left whitespace boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2510 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2511 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2512
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2513 /* Whitespace past a newline is considered right whitespace. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2514 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2515 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2516 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2517
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2518 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2519 || rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2520 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2521 dl->bounds.left_white += rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2522 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2523 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2524 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2525 elt = Dynarr_length (db->runes);
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2529 /* Calculate right whitespace boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2530 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2531 int elt = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2532 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2534 while (!done && elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2535 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2536 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2538 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2539 && isspace (rb->object.chr.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2540 && !rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2541 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2542 dl->bounds.right_white = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2543 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2544 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2546 elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2547
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2548 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2549
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2550 /* The line is blank so everything is considered to be right
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2551 whitespace. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2552 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2553 dl->bounds.right_white = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2554 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2556 /* Set the display blocks bounds. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2557 db->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2558 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2559 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2560 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2561
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2562 db->end_pos = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2563 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2564 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2565 db->end_pos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2567 /* update line height parameters */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2568 if (!data.new_ascent && !data.new_descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2569 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2570 /* We've got a blank line so initialize these values from the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2571 face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2572 default_face_font_info (data.window, &data.new_ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2573 &data.new_descent, 0, 0, 0);
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 if (data.max_pixmap_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2577 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2578 int height = data.new_ascent + data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2579 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2580
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2581 pix_descent = data.max_pixmap_height * data.new_descent / height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2582 pix_ascent = data.max_pixmap_height - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2584 data.new_ascent = max (data.new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2585 data.new_descent = max (data.new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2586 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2587
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2588 dl->ascent = data.new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2589 dl->descent = data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2590
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2591 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2592 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2593
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2594 if (dl->ascent < ascent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2595 dl->ascent = ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2596 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2597 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2598 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2599
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2600 if (dl->descent < descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2601 dl->descent = descent;
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 dl->cursor_elt = data.cursor_x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2605 /* #### lossage lossage lossage! Fix this shit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2606 if (data.bi_bufpos > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2607 dl->end_bufpos = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2608 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2609 dl->end_bufpos = bytind_to_bufpos (b, data.bi_bufpos) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2610 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2611 data.dl->num_chars = column_at_point (b, dl->end_bufpos, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2612 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2613 /* This doesn't correctly take into account tabs and control
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2614 characters but if the window isn't being truncated then this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2615 value isn't going to end up being used anyhow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2616 data.dl->num_chars = dl->end_bufpos - dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2618 /* #### handle horizontally scrolled line with text none of which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2619 was actually laid out. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2620
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2621 /* #### handle any remainder of overlay arrow */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2623 if (*prop == ADD_FAILED)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2624 *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2625
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2626 if (truncate_win && *prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2627 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2628 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2629 *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2630 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2631
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2632 extent_fragment_delete (data.ef);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2633
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2634 /* #### If we started at EOB, then make sure we return a value past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2635 it so that regenerate_window will exit properly. This is bogus.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2636 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
2637 this function if we are already at EOB. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2639 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
2640 return data.bi_bufpos + 1; /* Yuck! */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2641 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2642 return data.bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2643 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2644
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2645 /* Display the overlay arrow at the beginning of the given line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2647 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2648 create_overlay_glyph_block (struct window *w, struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2649 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2650 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2651 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2652 pos_data data;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
2653
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2654 /* If Voverlay_arrow_string isn't valid then just fail silently. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2655 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2656 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2657
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2658 memset (&data, 0, sizeof (data));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2659 data.ef = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2660 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2661 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2662 data.db = get_display_block_from_line (dl, OVERWRITE);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2663 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2664 data.pixpos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2665 data.max_pixpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2666 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2667 data.cursor_x = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2668 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2669 data.last_charset = Qunbound;
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
2670 data.last_findex = DEFAULT_INDEX;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2671 data.result_str = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2672
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2673 Dynarr_reset (data.db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2674
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2675 if (STRINGP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2676 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2677 add_bufbyte_string_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2678 (&data,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
2679 XSTRING_DATA (Voverlay_arrow_string),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
2680 XSTRING_LENGTH (Voverlay_arrow_string),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2681 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2682 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2683 else if (GLYPHP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2684 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2685 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2687 gb.glyph = Voverlay_arrow_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2688 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2689 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2692 if (data.max_pixmap_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2693 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2694 int height = data.new_ascent + data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2695 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2697 pix_descent = data.max_pixmap_height * data.new_descent / height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2698 pix_ascent = data.max_pixmap_height - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2699
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2700 data.new_ascent = max (data.new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2701 data.new_descent = max (data.new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2702 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2703
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2704 dl->ascent = data.new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2705 dl->descent = data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2706
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2707 data.db->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2708 data.db->end_pos = data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2709
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
2710 return data.pixpos - dl->bounds.left_in;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2711 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2712
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2713 /* Add a type of glyph to a margin display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2714
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2715 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2716 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2717 int count, int glyph_type, int side, Lisp_Object window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2718 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2719 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2720 ? dl->left_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2721 : dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2722 int elt, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2723 int xpos = start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2724 int reverse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2725
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2726 if ((glyph_type == GL_WHITESPACE && side == LEFT_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2727 || (glyph_type == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2728 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2729 reverse = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2730 elt = Dynarr_length (gbd) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2731 end = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2732 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2733 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2734 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2735 reverse = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2736 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2737 end = Dynarr_length (gbd);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2738 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2739
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2740 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2741 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2742 struct glyph_block *gb = Dynarr_atp (gbd, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2743
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2744 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2745 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2746
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2747 if (gb->active &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2748 ((side == LEFT_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2749 extent_begin_glyph_layout (XEXTENT (gb->extent)) == glyph_type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2750 || (side == RIGHT_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2751 extent_end_glyph_layout (XEXTENT (gb->extent)) == glyph_type)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2752 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2753 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2754
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2755 rb.width = gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2756 rb.findex = gb->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2757 rb.xpos = xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2758 rb.bufpos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2759 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2760 rb.type = RUNE_DGLYPH;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2761 rb.object.dglyph.glyph = gb->glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2762 rb.object.dglyph.extent = gb->extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2763 rb.object.dglyph.xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2764 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2765
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2766 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2767 xpos += rb.width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2768 count--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2769 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2771 if (glyph_contrib_p (gb->glyph, window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2772 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2773 unsigned short ascent, descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2774 Lisp_Object baseline = glyph_baseline (gb->glyph, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2776 ascent = glyph_ascent (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2777 descent = glyph_descent (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2779 /* A pixmap that has not had a baseline explicitly set.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2780 We use the existing ascent / descent ratio of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2781 line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2782 if (NILP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2783 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2784 int gheight = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2785 int line_height = dl->ascent + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2786 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2788 pix_descent = (int) (gheight * dl->descent) / line_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2789 pix_ascent = gheight - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2791 dl->ascent = max ((int) dl->ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2792 dl->descent = max ((int) dl->descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2793 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2794
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2795 /* A string so determine contribution normally. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2796 else if (EQ (baseline, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2797 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2798 dl->ascent = max (dl->ascent, ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2799 dl->descent = max (dl->descent, descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2800 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2802 /* A pixmap with an explicitly set baseline. We determine the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2803 contribution here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2804 else if (INTP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2805 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2806 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2807 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2808
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2809 pix_ascent = height * XINT (baseline) / 100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2810 pix_descent = height - pix_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2811
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2812 dl->ascent = max ((int) dl->ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2813 dl->descent = max ((int) dl->descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2814 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2815
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2816 /* Otherwise something is screwed up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2817 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2818 abort ();
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2822 (reverse ? elt-- : elt++);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2823 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2824
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2825 return xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2826 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2827
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2828 /* Add a blank to a margin display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2830 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2831 add_margin_blank (struct display_line *dl, struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2832 struct window *w, int xpos, int width, int side)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2833 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2834 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2835
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2836 rb.findex = (side == LEFT_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2837 ? get_builtin_face_cache_index (w, Vleft_margin_face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2838 : get_builtin_face_cache_index (w, Vright_margin_face));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2839 rb.xpos = xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2840 rb.width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2841 rb.bufpos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2842 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2843 rb.type = RUNE_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2844 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2845
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2846 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2847 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2849 /* Display glyphs in the left outside margin, left inside margin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2850 left whitespace area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2851
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2852 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2853 create_left_glyph_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2854 int overlay_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2855 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2856 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2858 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2859 int elt, end_xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2860 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
2861 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
2862 int left_in_start = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2863 int left_in_end = dl->bounds.left_in + overlay_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2864
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2865 struct display_block *odb, *idb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2867 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2868
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2869 /* We have to add the glyphs to the line in the order outside,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2870 inside, whitespace. However the precedence dictates that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2871 determine how many will fit in the reverse order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2872
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2873 /* Determine how many whitespace glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2874 they should start. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2875 white_in_start = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2876 white_out_start = left_in_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2877 white_out_cnt = white_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2878 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2879
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2880 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2881 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2882 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2883
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2884 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2885 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2887 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2888 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2889 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2890
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2891 width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2892
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2893 if (white_in_start - width >= left_in_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2894 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2895 white_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2896 white_in_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2897 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2898 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2899 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2900 else if (use_overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2901 && (white_out_start - width > dl->bounds.left_out))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2902 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2903 white_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2904 white_out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2905 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2906 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2907 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2908 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2909 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2910 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2911
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2912 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2913 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2914
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2915 /* Determine how many inside margin glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2916 they should start. The inside margin glyphs get whatever space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2917 is left after the whitespace glyphs have been displayed. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2918 are tricky to calculate since if we decide to use the overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2919 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
2920 list of just the inside margin glyphs and manipulate it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2921 determine the needed info. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2922 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2923 glyph_block_dynarr *ib;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2924 int avail_in, avail_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2925 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2926 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2927 int used_in, used_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2928
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2929 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2930 used_in = used_out = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
2931 ib = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2932 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2933 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2934 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2935
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2936 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2937 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2938
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2939 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2940 GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2941 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2942 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2943 used_in += gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2944 Dynarr_add (ib, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2945 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2947 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2948 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2949
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2950 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2951 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2952 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2953 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2954 avail_in = white_in_start - left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2955 if (avail_in < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2956 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2957 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2958
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2959 if (!use_overflow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2960 avail_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2961 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2962 avail_out = white_out_start - dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2964 marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2965 while (!done && marker < Dynarr_length (ib))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2966 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2967 int width = Dynarr_atp (ib, marker)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2969 /* If everything now fits in the available inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2970 space, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2971 if (used_in <= avail_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2972 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2973 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2974 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2975 /* Otherwise see if we have room to move a glyph to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2976 outside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2977 if (used_out + width <= avail_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2978 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2979 used_out += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2980 used_in -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2981 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2982 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2983 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2984 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2986 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2987 marker++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2988 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2990 /* At this point we now know that everything from marker on goes in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2991 the inside margin and everything before it goes in the outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2992 margin. The stuff going into the outside margin is guaranteed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2993 to fit, but we may have to trim some stuff from the inside. */
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_end = left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2996 in_out_start = white_out_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2997 in_out_cnt = in_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2998
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2999 Dynarr_free (ib);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3000 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3001 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3002 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3003 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3005 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3006 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3007
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3008 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3009 GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3010 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3011 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3012
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3013 if (used_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3014 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3015 in_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3016 in_out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3017 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3018 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3019 used_out -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3020 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3021 else if (in_in_end + width < white_in_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3022 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3023 in_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3024 in_in_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3025 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3026 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3027 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3028 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3029 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3030 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3032 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3033 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3034 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3035
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3036 /* Determine how many outside margin glyphs we can display. They
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3037 always start at the left outside margin and can only use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3038 outside margin space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3039 out_end = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3040 out_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3041 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3042
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3043 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3044 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3045 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3047 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3048 abort (); /* these should have beeb handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3049
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3050 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3051 GL_OUTSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3052 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3053 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3054
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3055 if (out_end + width <= in_out_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3056 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3057 out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3058 out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3059 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3060 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3061 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3062 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3063 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3064 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3065
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3066 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3067 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3068
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
3069 /* Now that we know where everything goes, we add the glyphs as
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
3070 runes to the appropriate display blocks. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3071 if (out_cnt || in_out_cnt || white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3072 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3073 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3074 odb->start_pos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3075 /* #### We should stop adding a blank to account for the space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3076 between the end of the glyphs and the margin and instead set
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3077 this accordingly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3078 odb->end_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3079 Dynarr_reset (odb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3080 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3081 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3082 odb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3084 if (in_in_cnt || white_in_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 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3087 idb->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3088 /* #### See above comment for odb->end_pos */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3089 idb->end_pos = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3090 Dynarr_reset (idb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3091 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3092 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3093 idb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3094
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3095 /* First add the outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3096 if (out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3097 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3098 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3099 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3100 end_xpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3102 /* There may be blank space between the outside margin glyphs and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3103 the inside margin glyphs. If so, add a blank. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3104 if (in_out_cnt && (in_out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3105 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3106 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3107 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3108 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3109
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3110 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3111 outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3112 if (in_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3114 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3115 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3116 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3117
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3118 /* If we didn't add any inside margin glyphs to the outside margin,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3119 but are adding whitespace glyphs, then we need to add a blank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3120 here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3121 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3122 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3123 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3124 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3125 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3126
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3127 /* Next add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3128 outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3129 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3130 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3131 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3132 GL_WHITESPACE, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3133 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3134
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3135 /* We take care of clearing between the end of the glyphs and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3136 start of the inside margin for lines which have glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3137 if (odb && (left_in_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3138 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3139 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3140 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3141 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3143 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3144 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3145 if (in_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3146 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3147 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3148 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3149 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3150 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3151 end_xpos = left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3153 /* Make sure that the area between the end of the inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3154 glyphs and the whitespace glyphs is cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3155 if (idb && (white_in_start - end_xpos > 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3156 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3157 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3158 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3159 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3160
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3161 /* Next add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3162 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3163 if (white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3164 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3165 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3166 LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3167 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3168
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3169 /* Whitespace glyphs always end right next to the text block so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3170 there is nothing we have to make sure is cleared after them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3171 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3173 /* Display glyphs in the right outside margin, right inside margin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3174 right whitespace area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3176 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3177 create_right_glyph_block (struct window *w, struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3178 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3179 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3180
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3181 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3182 int elt, end_xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3183 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
3184 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
3185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3186 struct display_block *odb, *idb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3187
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3188 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3190 /* We have to add the glyphs to the line in the order outside,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3191 inside, whitespace. However the precedence dictates that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3192 determine how many will fit in the reverse order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3194 /* Determine how many whitespace glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3195 they should start. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3196 white_in_end = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3197 white_out_end = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3198 white_out_cnt = white_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3199 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3201 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3202 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3203 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, 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 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3206 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3208 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3209 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3210 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3211
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3212 if (white_in_end + width <= dl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3213 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3214 white_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3215 white_in_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3216 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3217 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3218 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3219 else if (use_overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3220 && (white_out_end + width <= dl->bounds.right_out))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3221 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3222 white_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3223 white_out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3224 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3225 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3226 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3227 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3228 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3229 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3230
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3231 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3232 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3234 /* Determine how many inside margin glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3235 they should start. The inside margin glyphs get whatever space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3236 is left after the whitespace glyphs have been displayed. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3237 are tricky to calculate since if we decide to use the overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3238 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
3239 list of just the inside margin glyphs and manipulate it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3240 determine the needed info. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3241 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3242 glyph_block_dynarr *ib;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3243 int avail_in, avail_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3244 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3245 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3246 int used_in, used_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3248 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3249 used_in = used_out = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
3250 ib = Dynarr_new (glyph_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3251 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3252 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3253 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
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 (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3256 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3257
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3258 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3259 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3260 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3261 used_in += gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3262 Dynarr_add (ib, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3263 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3264
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3265 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3266 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3267
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3268 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3269 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3270 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3271 avail_in = dl->bounds.right_in - white_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3272
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3273 if (!use_overflow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3274 avail_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3275 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3276 avail_out = dl->bounds.right_out - white_out_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3278 marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3279 while (!done && marker < Dynarr_length (ib))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3280 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3281 int width = Dynarr_atp (ib, marker)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3282
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3283 /* If everything now fits in the available inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3284 space, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3285 if (used_in <= avail_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3286 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3287 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3288 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3289 /* Otherwise see if we have room to move a glyph to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3290 outside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3291 if (used_out + width <= avail_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3292 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3293 used_out += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3294 used_in -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3295 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3296 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3297 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3298 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3300 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3301 marker++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3302 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3303
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3304 /* At this point we now know that everything from marker on goes in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3305 the inside margin and everything before it goes in the outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3306 margin. The stuff going into the outside margin is guaranteed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3307 to fit, but we may have to trim some stuff from the inside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3308
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3309 in_in_start = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3310 in_out_end = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3311 in_out_cnt = in_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3312
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3313 Dynarr_free (ib);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3314 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3315 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3316 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3317 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, 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 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3320 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3321
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3322 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3323 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3324 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3325
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3326 if (used_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3327 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3328 in_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3329 in_out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3330 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3331 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3332 used_out -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3333 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3334 else if (in_in_start - width >= white_in_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3335 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3336 in_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3337 in_in_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3338 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3339 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3340 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3341 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3342 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3343 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3344
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3345 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3346 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3347 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3349 /* Determine how many outside margin glyphs we can display. They
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3350 always start at the right outside margin and can only use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3351 outside margin space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3352 out_start = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3353 out_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3354 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3355
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3356 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3357 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3358 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3360 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3361 abort (); /* these should have beeb handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3362
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3363 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3364 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3365 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
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 (out_start - width >= in_out_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3368 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3369 out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3370 out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3371 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3372 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3373 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3374 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3375 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3376 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3378 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3379 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3380
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3381 /* Now that we now where everything goes, we add the glyphs as runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3382 to the appropriate display blocks. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3383 if (out_cnt || in_out_cnt || white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3384 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3385 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3386 /* #### See comments before odb->start_pos init in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3387 create_left_glyph_block */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3388 odb->start_pos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3389 odb->end_pos = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3390 Dynarr_reset (odb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3391 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3392 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3393 odb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3394
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3395 if (in_in_cnt || white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3396 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3397 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3398 idb->start_pos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3399 /* #### See comments before odb->start_pos init in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3400 create_left_glyph_block */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3401 idb->end_pos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3402 Dynarr_reset (idb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3403 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3404 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3405 idb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3407 /* First add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3408 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3409 if (white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3410 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3411 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3412 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3413 window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3414 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3415 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3416 end_xpos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3417
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3418 /* Make sure that the area between the end of the whitespace glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3419 and the inside margin glyphs is cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3420 if (in_in_cnt && (in_in_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3421 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3422 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3423 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3424 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3425
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3426 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3427 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3428 if (in_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3429 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3430 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3431 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3432 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3433
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3434 /* 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
3435 of the inside margin area gets cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3436 if (idb && (dl->bounds.right_in - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3437 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3438 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
3439 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3440 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3441
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3442 /* Next add any whitespace glyphs in the outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3443 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3444 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3445 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
3446 GL_WHITESPACE, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3447 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3448 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3449 end_xpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3451 /* Next add any inside margin glyphs in the outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3452 if (in_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3453 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3454 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3455 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3456 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3458 /* There may be space between any whitespace or inside margin glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3459 in the outside margin and the actual outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3460 if (odb && (out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3461 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3462 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3463 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3464 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3466 /* Finally, add the outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3467 if (out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3468 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3469 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3470 RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3471 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3472 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3475 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3476 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3477 /* modeline routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3478 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3479 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3480
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3481 /* Ensure that the given display line DL accurately represents the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3482 modeline for the given window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3483
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3484 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3485 generate_modeline (struct window *w, struct display_line *dl, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3486 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3487 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3488 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3489 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3491 /* Unlike display line and rune pointers, this one can't change underneath
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3492 our feet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3493 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3494 int max_pixpos, min_pixpos, ypos_adj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3495 Lisp_Object font_inst;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3496
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3497 /* This will actually determine incorrect inside boundaries for the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3498 modeline since it ignores the margins. However being aware of this fact
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3499 we never use those values anywhere so it doesn't matter. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3500 dl->bounds = calculate_display_line_boundaries (w, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3502 /* We are generating a modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3503 dl->modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3504 dl->cursor_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3505
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3506 /* Reset the runes on the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3507 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3508
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3509 if (!WINDOW_HAS_MODELINE_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3510 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3511 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3512
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3513 /* If there is a horizontal scrollbar, don't add anything. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3514 if (window_scrollbar_height (w))
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 dl->ascent = DEVMETH (d, divider_height, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3518 dl->descent = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3519 /* The modeline is at the bottom of the gutters. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3520 dl->ypos = WINDOW_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3521
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3522 rb.findex = MODELINE_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3523 rb.xpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3524 rb.width = dl->bounds.right_out - dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3525 rb.bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3526 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3527 rb.type = RUNE_HLINE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3528 rb.object.hline.thickness = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3529 rb.object.hline.yoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3530 rb.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3532 if (!EQ (Qzero, w->modeline_shadow_thickness)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3533 && FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3534 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3535 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3536
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3537 dl->ypos -= shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3538 rb.xpos += shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3539 rb.width -= 2 * shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3540 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3542 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3543 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3544 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3546 /* !!#### not right; needs to compute the max height of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3547 all the charsets */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3548 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3549
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3550 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3551 dl->descent = XFONT_INSTANCE (font_inst)->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3552
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3553 min_pixpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3554 max_pixpos = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3556 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3557 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3558 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3559
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3560 ypos_adj = shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3561 min_pixpos += shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3562 max_pixpos -= shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3563 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3564 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3565 ypos_adj = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3567 generate_formatted_string_db (b->modeline_format,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3568 b->generated_modeline_string, w, dl, db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3569 MODELINE_INDEX, min_pixpos, max_pixpos, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3570
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3571 /* 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
3572 set this until we've generated teh modeline in order to account
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3573 for any embedded faces. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3574 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3575 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3576
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3577 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3578 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3579 struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3580 struct display_block *db, face_index findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3581 int min_pixpos, int max_pixpos, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3582 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3583 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3584 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3586 pos_data data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3587 int c_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3589 memset (&data, 0, sizeof (data));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3590 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3591 data.db = db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3592 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3593 data.findex = findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3594 data.pixpos = min_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3595 data.max_pixpos = max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3596 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3597 data.last_charset = Qunbound;
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
3598 data.last_findex = DEFAULT_INDEX;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3599 data.result_str = result_str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3600 data.is_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3601 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3602
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3603 Dynarr_reset (formatted_string_extent_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3604 Dynarr_reset (formatted_string_extent_start_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3605 Dynarr_reset (formatted_string_extent_end_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3607 /* This recursively builds up the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3608 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3609 max_pixpos - min_pixpos, findex, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3611 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3612 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3613 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3614 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3615 c_pixpos = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3616 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3617 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3618 c_pixpos = min_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3619
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3620 /* If we don't reach the right side of the window, add a blank rune
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3621 to make up the difference. This usually only occurs if the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3622 modeline face is using a proportional width font or a fixed width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3623 font of a different size from the default face font. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3624
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3625 if (c_pixpos < max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3626 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3627 data.pixpos = c_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3628 data.blank_width = max_pixpos - data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3630 add_blank_rune (&data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3631 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3632
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3633 /* Now create the result string and frob the extents into it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3634 if (!NILP (result_str))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3635 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3636 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3637 Bytecount len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3638 Bufbyte *strdata;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3639 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3640
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3641 detach_all_extents (result_str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3642 resize_string (XSTRING (result_str), -1,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
3643 data.bytepos - XSTRING_LENGTH (result_str));
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
3644
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
3645 strdata = XSTRING_DATA (result_str);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3647 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3648 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3649 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3650 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3651 len += (set_charptr_emchar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3652 (strdata + len, Dynarr_atp (db->runes,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3653 elt)->object.chr.ch));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3654 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3655 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3656
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3657 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3658 elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3659 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3660 Lisp_Object extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3661 Lisp_Object child;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3662
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3663 XSETEXTENT (extent, Dynarr_at (formatted_string_extent_dynarr, elt));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3664 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3665 if (NILP (child))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3666 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3667 child = Fmake_extent (Qnil, Qnil, result_str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3668 Fputhash (extent, child, buf->modeline_extent_table);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3669 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3670 Fset_extent_parent (child, extent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3671 set_extent_endpoints
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3672 (XEXTENT (child),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3673 Dynarr_at (formatted_string_extent_start_dynarr, elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3674 Dynarr_at (formatted_string_extent_end_dynarr, elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3675 result_str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3676 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3677 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3678 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3679
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3680 static Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3681 add_string_to_fstring_db_runes (pos_data *data, CONST Bufbyte *str,
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3682 Charcount pos, Charcount min_pos, Charcount max_pos)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3683 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3684 /* This function has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3685 Charcount end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3686 CONST Bufbyte *cur_pos = str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3687 struct display_block *db = data->db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3689 data->blank_width = space_width (XWINDOW (data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3690 while (Dynarr_length (db->runes) < pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3691 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3692
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3693 end = (Dynarr_length (db->runes) +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3694 bytecount_to_charcount (str, strlen ((CONST char *) str)));
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3695 if (max_pos != -1)
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3696 end = min (max_pos, end);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3697
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3698 while (pos < end && *cur_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3699 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3700 CONST Bufbyte *old_cur_pos = cur_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3701 int succeeded;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3702
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3703 data->ch = charptr_emchar (cur_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3704 succeeded = (add_emchar_rune (data) != ADD_FAILED);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3705 INC_CHARPTR (cur_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3706 if (succeeded)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3707 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3708 pos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3709 data->modeline_charpos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3710 data->bytepos += cur_pos - old_cur_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3711 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3712 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3713
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3714 while (Dynarr_length (db->runes) < min_pos &&
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3715 (data->pixpos + data->blank_width <= data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3716 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3717
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3718 return Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3719 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3720
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3721 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3722 modeline extents. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3723 static Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3724 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3725 Charcount pos, Charcount min_pos, Charcount max_pos)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3726 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3727 /* This function has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3728 Charcount end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3729 struct display_block *db = data->db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3730 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3731
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3732 data->blank_width = space_width (XWINDOW (data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3733 while (Dynarr_length (db->runes) < pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3734 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3735
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3736 end = Dynarr_length (db->runes) + 1;
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3737 if (max_pos != -1)
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3738 end = min (max_pos, end);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3739
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3740 gb.glyph = glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3741 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3742 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3743 pos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3745 while (Dynarr_length (db->runes) < pos &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3746 (data->pixpos + data->blank_width <= data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3747 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3748
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3749 return Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3750 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3751
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3752 /* If max_pos is == -1, it is considered to be infinite. The same is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3753 true of max_pixsize. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3754 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3755 if (Dynarr_length (data->db->runes)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3756 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3757 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3758 cur_pixsize = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3759
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3760 /* Note that this function does "positions" in terms of characters and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3761 not in terms of columns. This is necessary to make the formatting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3762 work correctly when proportional width fonts are used in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3763 modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3764 static Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3765 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3766 Charcount min_pos, Charcount max_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3767 Lisp_Object elt, int depth, int max_pixsize,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3768 face_index findex, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3769 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3770 /* This function has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3771 /* #### The other losing things in this function are:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3772
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3773 -- C zero-terminated-string lossage.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3774 -- Non-printable characters should be converted into something
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3775 appropriate (e.g. ^F) instead of blindly being printed anyway.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3776 */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
3777
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3778 tail_recurse:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3779 if (depth > 10)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3780 goto invalid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3782 depth++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3783
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3784 if (STRINGP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3785 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3786 /* A string. Add to the display line and check for %-constructs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3787 within it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3788
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
3789 Bufbyte *this = XSTRING_DATA (elt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3791 while ((pos < max_pos || max_pos == -1) && *this)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3792 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3793 Bufbyte *last = this;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3794
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3795 while (*this && *this != '%')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3796 this++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3797
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3798 if (this != last)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3799 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3800 /* The string is just a string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3801 Charcount size =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3802 bytecount_to_charcount (last, this - last) + pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3803 Charcount tmp_max = (max_pos == -1 ? size : min (size, max_pos));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3804
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3805 pos = add_string_to_fstring_db_runes (data, last, pos, pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3806 tmp_max);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3807 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3808 else /* *this == '%' */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3809 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3810 Charcount spec_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3811
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3812 this++; /* skip over '%' */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3814 /* We can't allow -ve args due to the "%-" construct.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3815 * Argument specifies minwidth but not maxwidth
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3816 * (maxwidth can be specified by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3817 * (<negative-number> . <stuff>) modeline elements)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3818 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3819 while (isdigit (*this))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3820 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3821 spec_width = spec_width * 10 + (*this - '0');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3822 this++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3823 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3824 spec_width += pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3825
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3826 if (*this == 'M')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3827 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3828 pos = generate_fstring_runes (w, data, pos, spec_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3829 max_pos, Vglobal_mode_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3830 depth, max_pixsize, findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3831 type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3832 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3833 else if (*this == '-')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3834 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3835 Charcount num_to_add;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3836
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3837 if (max_pixsize < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3838 num_to_add = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3839 else if (max_pos != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3840 num_to_add = max_pos - pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3841 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3842 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3843 int cur_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3844 int dash_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3845 Bufbyte ch = '-';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3846 SET_CURRENT_MODE_CHARS_PIXSIZE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3847
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3848 dash_pixsize =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3849 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3850 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3851
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3852 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3853 num_to_add++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3854 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3856 while (num_to_add--)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3857 pos = add_string_to_fstring_db_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3858 (data, (CONST Bufbyte *) "-", pos, pos, max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3859 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3860 else if (*this != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3861 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3862 Bufbyte *str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3863 Emchar ch = charptr_emchar (this);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3864 decode_mode_spec (w, ch, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3865
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3866 str = Dynarr_atp (mode_spec_bufbyte_string, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3867 pos = add_string_to_fstring_db_runes (data,str, pos, pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3868 max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3869 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3871 /* NOT this++. There could be any sort of character at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3872 the current position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3873 INC_CHARPTR (this);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3874 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3876 if (max_pixsize > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3877 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3878 int cur_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3879 SET_CURRENT_MODE_CHARS_PIXSIZE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3880
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3881 if (cur_pixsize >= max_pixsize)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3882 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3883 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3884 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3885 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3886 else if (SYMBOLP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3887 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3888 /* A symbol: process the value of the symbol recursively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3889 as if it appeared here directly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3890 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3891
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3892 if (!UNBOUNDP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3893 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3894 /* If value is a string, output that string literally:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3895 don't check for % within it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3896 if (STRINGP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3897 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3898 pos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3899 add_string_to_fstring_db_runes
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
3900 (data, XSTRING_DATA (tem), pos, min_pos, max_pos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3901 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3902 /* Give up right away for nil or t. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3903 else if (!EQ (tem, elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3904 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
3905 elt = tem;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
3906 goto tail_recurse;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3907 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3908 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3909 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3910 else if (CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3911 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3912 /* A cons cell: four distinct cases.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3913 * If first element is a string or a cons, process all the elements
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3914 * and effectively concatenate them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3915 * If first element is a negative number, truncate displaying cdr to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3916 * at most that many characters. If positive, pad (with spaces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3917 * to at least that many characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3918 * If first element is a symbol, process the cadr or caddr recursively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3919 * according to whether the symbol's value is non-nil or nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3920 * If first element is a face, process the cdr recursively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3921 * without altering the depth.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3922 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3923 Lisp_Object car, tem;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3924
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3925 car = XCAR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3926 if (SYMBOLP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3927 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3928 elt = XCDR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3929 if (!CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3930 goto invalid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3931 tem = symbol_value_in_buffer (car, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3932 /* elt is now the cdr, and we know it is a cons cell.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3933 Use its car if CAR has a non-nil value. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3934 if (!UNBOUNDP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3935 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3936 if (!NILP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3937 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
3938 elt = XCAR (elt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3939 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3940 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3941 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3942 /* Symbol's value is nil (or symbol is unbound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3943 * Get the cddr of the original list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3944 * and if possible find the caddr and use that.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3945 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3946 elt = XCDR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3947 if (NILP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3948 ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3949 else if (!CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3950 goto invalid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3951 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3952 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3953 elt = XCAR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3954 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3955 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3956 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3957 else if (INTP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3958 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3959 Charcount lim = XINT (car);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3960
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3961 elt = XCDR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3962
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3963 if (lim < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3964 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3965 /* Negative int means reduce maximum width.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3966 * DO NOT change MIN_PIXPOS here!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3967 * (20 -10 . foo) should truncate foo to 10 col
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3968 * and then pad to 20.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3969 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3970 if (max_pos == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3971 max_pos = pos - lim;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3972 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3973 max_pos = min (max_pos, pos - lim);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3974 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3975 else if (lim > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3976 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3977 /* Padding specified. Don't let it be more than
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3978 * current maximum.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3979 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3980 lim += pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3981 if (max_pos != -1 && lim > max_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3982 lim = max_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3983 /* If that's more padding than already wanted, queue it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3984 * But don't reduce padding already specified even if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3985 * that is beyond the current truncation point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3986 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3987 if (lim > min_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3988 min_pos = lim;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3989 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3990 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3991 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3992 else if (STRINGP (car) || CONSP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3993 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3994 int limit = 50;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3995 /* LIMIT is to protect against circular lists. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3996 while (CONSP (elt) && --limit > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3997 && (pos < max_pos || max_pos == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3998 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3999 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4000 XCAR (elt), depth,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4001 max_pixsize, findex, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4002 elt = XCDR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4003 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4004 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4005 else if (EXTENTP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4006 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4007 struct extent *ext = XEXTENT (car);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4008
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4009 if (EXTENT_LIVE_P (ext))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4010 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4011 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4012 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4013 Lisp_Object font_inst;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4014 face_index new_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4015 Bytecount start = data->bytepos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4016
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4017 face = extent_face (ext);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4018 if (FACEP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4019 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4020 /* #### needs to merge faces, sigh */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4021 /* #### needs to handle list of faces */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4022 new_findex = get_builtin_face_cache_index (w, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4023 /* !!#### not right; needs to compute the max height of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4024 all the charsets */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4025 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4026 Vcharset_ascii);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
4027
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4028 data->dl->ascent = max (data->dl->ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4029 XFONT_INSTANCE (font_inst)->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4030 data->dl->descent = max (data->dl->descent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4031 XFONT_INSTANCE (font_inst)->
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4032 descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4033 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4034 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4035 new_findex = old_findex;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
4036
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4037 data->findex = new_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4038 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4039 XCDR (elt), depth - 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4040 max_pixsize, new_findex, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4041 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4042 Dynarr_add (formatted_string_extent_dynarr, ext);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4043 Dynarr_add (formatted_string_extent_start_dynarr, start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4044 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4045 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4046 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4047 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4048 else if (GLYPHP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4049 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4050 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4051 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4052 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4053 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4054 invalid:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4055 pos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4056 add_string_to_fstring_db_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4057 (data, (CONST Bufbyte *) GETTEXT ("*invalid*"), pos, min_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4058 max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4059 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4060
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4061 if (min_pos > pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4062 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4063 add_string_to_fstring_db_runes (data, (CONST Bufbyte *) "", pos, min_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4064 -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4065 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4066
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4067 return pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4068 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4069
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4070 /* The caller is responsible for freeing the returned string. */
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4071 Bufbyte *
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4072 generate_formatted_string (struct window *w, Lisp_Object format_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4073 Lisp_Object result_str, face_index findex, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4074 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4075 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4076 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4077 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4078
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4079 dl = &formatted_string_display_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4080 db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4081 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4082
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4083 generate_formatted_string_db (format_str, result_str, w, dl, db, findex, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4084 -1, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4085
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4086 Dynarr_reset (formatted_string_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4087 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4088 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4089 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4090 Dynarr_add (formatted_string_emchar_dynarr,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4091 Dynarr_atp (db->runes, elt)->object.chr.ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4092 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4093 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4094
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4095 return
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4096 convert_emchar_string_into_malloced_string
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4097 ( Dynarr_atp (formatted_string_emchar_dynarr, 0),
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4098 Dynarr_length (formatted_string_emchar_dynarr), 0);
0
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 /* Update just the modeline. Assumes the desired display structs. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4102 they do not have a modeline block, it does nothing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4103 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4104 regenerate_modeline (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4105 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4106 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4107
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4108 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4109 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4110 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4111 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4112 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4113 redisplay_update_line (w, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4114 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4115 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4116
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4117 /* Make sure that modeline display line is present in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4118 display structs if the window has a modeline and update that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4119 line. Returns true if a modeline was needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4120 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4121 ensure_modeline_generated (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4122 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4123 int 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 /* minibuffer windows don't have modelines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4126 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4127 need_modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4128 /* windows which haven't had it turned off do */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4129 else if (WINDOW_HAS_MODELINE_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4130 need_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4131 /* 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
4132 a horizontal scrollbar */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4133 else if (window_scrollbar_height (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4134 need_modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4135 /* and in this case there is none */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4136 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4137 need_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4139 if (need_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4140 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4141 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4143 dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4145 /* We don't care if there is a display line which is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4146 currently a modeline because it is definitely going to become
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4147 one if we have gotten to this point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4148 if (Dynarr_length (dla) == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4149 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4150 if (Dynarr_largest (dla) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4151 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4152 struct display_line *mlp = Dynarr_atp (dla, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4153 Dynarr_add (dla, *mlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4154 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4155 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4156 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4157 struct display_line modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4158 memset (&modeline, 0, sizeof (struct display_line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4159 Dynarr_add (dla, modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4160 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4161 }
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 we're adding a new place marker go ahead and generate the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4164 modeline so that it is available for use by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4165 window_modeline_height. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4166 generate_modeline (w, Dynarr_atp (dla, 0), type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4167 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4168
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4169 return need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4170 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4172 /* #### Kludge or not a kludge. I tend towards the former. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4173 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4174 real_current_modeline_height (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4175 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4176 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
4177 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4179 if (ensure_modeline_generated (w, CMOTION_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4180 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4181 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4182
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4183 if (Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4184 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4185 if (Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4186 return (Dynarr_atp (dla, 0)->ascent +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4187 Dynarr_atp (dla, 0)->descent);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4188 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4189 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4190 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4191 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4194 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4195 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4196 /* window-regeneration routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4197 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4198 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4200 /* For a given window and starting position in the buffer it contains,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4201 ensure that the TYPE display lines accurately represent the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4202 presentation of the window. We pass the buffer instead of getting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4203 it from the window since redisplay_window may have temporarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4204 changed it to the echo area buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4205
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4206 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4207 regenerate_window (struct window *w, Bufpos start_pos, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4208 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4209 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4210 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4211 int ypos = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4212 int yend; /* set farther down */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4213
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4214 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4215 layout_bounds bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4216 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4217 int need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4219 /* The lines had better exist by this point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4220 if (!(dla = window_display_lines (w, type)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4221 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4222 Dynarr_reset (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4223 w->max_line_len = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4225 /* Normally these get updated in redisplay_window but it is possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4226 for this function to get called from some other points where that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4227 update may not have occurred. This acts as a safety check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4228 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4229 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4230 if (!Dynarr_length (w->glyph_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4231 reset_glyph_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4232
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4233 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4234 Fset_marker (w->pointm[type], make_int (point), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4235 w->last_point_x[type] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4236 w->last_point_y[type] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4237
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4238 /* Make sure a modeline is in the structs if needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4239 need_modeline = ensure_modeline_generated (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4240
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4241 /* Wait until here to set this so that the structs have a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4242 generated in the case where one didn't exist. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4243 yend = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4244
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4245 bounds = calculate_display_line_boundaries (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4246
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4247 /* 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
4248 if (MINI_WINDOW_P (w)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4249 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4250 && !echo_area_active (f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4251 && start_pos == BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4252 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4253 struct prop_block pb;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4254 Lisp_Object string;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4255 prop = Dynarr_new (prop_block);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4256
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4257 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4258 pb.type = PROP_MINIBUF_PROMPT;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4259 pb.data.p_string.str = XSTRING_DATA(string);
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4260 pb.data.p_string.len = XSTRING_LENGTH(string);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4261 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4262 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4263 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4264 prop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4265
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4266 while (ypos < yend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4267 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4268 struct display_line dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4269 struct display_line *dlp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4270 int local;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4271
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4272 if (Dynarr_length (dla) < Dynarr_largest (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4273 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4274 dlp = Dynarr_atp (dla, Dynarr_length (dla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4275 local = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4276 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4277 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4278 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4279 dlp = &dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4280 memset (dlp, 0, sizeof (struct display_line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4281 local = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4282 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4283
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4284 dlp->bounds = bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4285 dlp->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4286 start_pos = generate_display_line (w, dlp, 1, start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4287 w->hscroll, &prop, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4288 dlp->ypos = ypos + dlp->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4289 ypos = dlp->ypos + dlp->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4291 if (ypos > yend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4292 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4293 int visible_height = dlp->ascent + dlp->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4295 dlp->clip = (ypos - yend);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4296 visible_height -= dlp->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4297
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4298 if (visible_height < VERTICAL_CLIP (w, 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4299 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4300 if (local)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4301 free_display_line (dlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4302 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4303 }
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 dlp->clip = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4307
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4308 if (dlp->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4309 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4310 /* #### This check is steaming crap. Have to get things
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4311 fixed so when create_text_block hits EOB, we're done,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4312 period. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4313 if (w->last_point_x[type] == -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 w->last_point_x[type] = dlp->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4316 w->last_point_y[type] = Dynarr_length (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4317 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4318 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4319 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4320 /* #### This means that we've added a cursor at EOB
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4321 twice. Yuck oh yuck. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4322 struct display_block *db =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4323 get_display_block_from_line (dlp, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4324
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4325 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4326 dlp->cursor_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4327 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4328 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4330 if (dlp->num_chars > w->max_line_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4331 w->max_line_len = dlp->num_chars;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4333 Dynarr_add (dla, *dlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4334
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4335 /* #### This isn't right, but it is close enough for now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4336 w->window_end_pos[type] = start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4337
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4338 /* #### This type of check needs to be done down in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4339 generate_display_line call. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4340 if (start_pos > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4341 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4342 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4343
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4344 if (prop)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4345 Dynarr_free (prop);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4346
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4347 /* #### More not quite right, but close enough. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4348 /* #### Ben sez: apparently window_end_pos[] is measured
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4349 as the number of characters between the window end and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4350 end of the buffer? This seems rather weirdo. What's
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4351 the justification for this? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4352 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4354 if (need_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4355 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4356 /* 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
4357 there when we first started working in this function. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4358 generate_modeline (w, Dynarr_atp (dla, 0), type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4359 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4360 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4361
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4362 #define REGEN_INC_FIND_START_END \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4363 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4364 /* Determine start and end of lines. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4365 if (!Dynarr_length (cdla)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4366 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4367 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4368 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4369 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4370 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4371 dla_start = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4372 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4373 else if (!Dynarr_atp (cdla, 0)->modeline \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4374 && !Dynarr_atp (ddla, 0)->modeline) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4375 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4376 dla_start = 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4377 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4378 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4379 abort (); /* structs differ */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4380 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4381 dla_end = Dynarr_length (cdla) - 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4382 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4383 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4384 start_pos = (Dynarr_atp (cdla, dla_start)->bufpos \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4385 + Dynarr_atp (cdla, dla_start)->offset); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4386 /* 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
4387 full regen. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4388 if (startp != start_pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4389 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4390 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4391 /* Point is outside the visible region so give up. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4392 if (pointm < start_pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4393 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4394 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4395 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4396
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4397 /* This attempts to incrementally update the display structures. It
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4398 returns a boolean indicating success or failure. This function is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4399 very similar to regenerate_window_incrementally and is in fact only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4400 called from that function. However, because of the nature of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4401 changes it deals with it sometimes makes different assumptions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4402 which can lead to success which are much more difficult to make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4403 when dealing with buffer changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4404
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4405 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4406 regenerate_window_extents_only_changed (struct window *w, Bufpos startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4407 Bufpos pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4408 Charcount beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4409 Charcount end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4410 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4411 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4412 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4413 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4414
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4415 int dla_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4416 int dla_end, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4417 int first_line, last_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4418 Bufpos start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4419 /* Don't define this in the loop where it is used because we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4420 definitely want its value to survive between passes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4421 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4423 /* 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
4424 been incremented, then fail. I'm not sure of the exact circumstances
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4425 under which this can happen, but I believe that it is probably a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4426 reasonable happening. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4427 if (!point_visible (w, pointm, CURRENT_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4428 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4429 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4430
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4431 /* If the cursor is moved we attempt to update it. If we succeed we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4432 go ahead and proceed with the optimization attempt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4433 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4434 || pointm != marker_position (w->last_point[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4435 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4436 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4437 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4438 struct frame *sel_f = device_selected_frame (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4439 int success = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4441 if (w->last_point_x[CURRENT_DISP] != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4442 && w->last_point_y[CURRENT_DISP] != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4443 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4445 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4446 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4447 /* Always regenerate the modeline in case it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4448 displaying the current line or column. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4449 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4450 success = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4451 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4452 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4453 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
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 (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4456 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4457 success = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4458 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4460 if (!success)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4461 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4462 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4463
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4464 if (beg_unchanged == -1 && end_unchanged == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4465 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4466
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4467 /* assert: There are no buffer modifications or they are all below the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4468 visible region. We assume that regenerate_window_incrementally has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4469 not called us unless this is true. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4471 REGEN_INC_FIND_START_END;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4472
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4473 /* If the changed are starts before the visible area, give up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4474 if (beg_unchanged < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4475 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4477 /* Find what display line the extent changes first affect. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4478 line = dla_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4479 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4480 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4481 struct display_line *dl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4482 Bufpos lstart = dl->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4483 Bufpos lend = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4484
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4485 if (beg_unchanged >= lstart && beg_unchanged <= lend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4486 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4488 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4489 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4491 /* If the changes are below the visible area then if point hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4492 moved return success otherwise fail in order to be safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4493 if (line > dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4494 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4495 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4496 && pointm == marker_position (w->last_point[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4497 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4498 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4499 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4500 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4502 /* At this point we know what line the changes first affect. We now
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4503 begin redrawing lines as long as we are still in the affected
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4504 region and the line's size and positioning don't change.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4505 Otherwise we fail. If we fail we will have altered the desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4506 structs which could lead to an assertion failure. However, if we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4507 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
4508 will actually end up being safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4509 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4510 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4511 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4512 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4514 first_line = last_line = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4515 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4516 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4517 Bufpos old_start, old_end, new_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4518 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4519 struct display_line *ddl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4520 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4521 int initial_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4523 assert (cdl->bufpos == ddl->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4524 assert (cdl->end_bufpos == ddl->end_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4525 assert (cdl->offset == ddl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4526
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4527 db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4528 initial_size = Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4529 old_start = ddl->bufpos + ddl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4530 old_end = ddl->end_bufpos + ddl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4532 /* If this is the first line being updated and it used
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4533 propagation data, fail. Otherwise we'll be okay because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4534 we'll have the necessary propagation data. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4535 if (line == first_line && ddl->used_prop_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4536 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4538 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4539 w->hscroll, &prop, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4540 ddl->offset = 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 /* #### If there is propagated stuff the fail. We could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4543 probably actually deal with this if the line had propagated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4544 information when originally created by a full
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4545 regeneration. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4546 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4547 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4548 Dynarr_free (prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4549 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4550 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4551
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4552 /* If any line position parameters have changed or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4553 cursor has disappeared or disappeared, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4554 db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4555 if (cdl->ypos != ddl->ypos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4556 || cdl->ascent != ddl->ascent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4557 || cdl->descent != ddl->descent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4558 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4559 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4560 || old_start != ddl->bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4561 || old_end != ddl->end_bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4562 || initial_size != Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4563 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4564 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4565 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4567 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4568 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4569 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4570 w->last_point_y[DESIRED_DISP] = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4571 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4573 last_line = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4574
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4575 /* If the extent changes end on the line we just updated then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4576 we're done. Otherwise go on to the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4577 if (end_unchanged <= ddl->end_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4578 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4579 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4580 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4581 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4582
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4583 redisplay_update_line (w, first_line, last_line, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4584 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4585 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4586
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4587 /* Attempt to update the display data structures based on knowledge of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4588 the changed region in the buffer. Returns a boolean indicating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4589 success or failure. If this function returns a failure then a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4590 regenerate_window _must_ be performed next in order to maintain
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4591 invariants located here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4592
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4593 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4594 regenerate_window_incrementally (struct window *w, Bufpos startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4595 Bufpos pointm)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4596 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4597 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4598 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4599 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4600 Charcount beg_unchanged, end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4601 Charcount extent_beg_unchanged, extent_end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4602
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4603 int dla_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4604 int dla_end, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4605 Bufpos start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4607 /* If this function is called, the current and desired structures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4608 had better be identical. If they are not, then that is a bug. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4609 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4611 /* We don't handle minibuffer windows yet. The minibuffer prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4612 screws us up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4613 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4614 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4616 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4617 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4618 ? -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4619 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4620
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4621 /* If nothing has changed in the buffer, then make sure point is ok
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4622 and succeed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4623 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4624 return regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4625 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4626 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4628 /* We can't deal with deleted newlines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4629 if (BUF_NEWLINE_WAS_DELETED (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4630 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4631
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4632 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4633 end_unchanged = (BUF_END_UNCHANGED (b) == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4634 ? -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4635 : BUF_Z (b) - BUF_END_UNCHANGED (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4636
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4637 REGEN_INC_FIND_START_END;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4639 /* If the changed area starts before the visible area, give up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4640 if (beg_unchanged < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4641 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4642
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4643 /* Find what display line the buffer changes first affect. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4644 line = dla_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4645 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4646 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4647 struct display_line *dl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4648 Bufpos lstart = dl->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4649 Bufpos lend = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4650
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4651 if (beg_unchanged >= lstart && beg_unchanged <= lend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4652 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4653
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4654 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4655 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4656
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4657 /* If the changes are below the visible area then if point hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4658 moved return success otherwise fail in order to be safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4659 if (line > dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4660 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4661 return regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4662 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4663 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4664 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4665 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4666 /* At this point we know what line the changes first affect. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4667 now redraw that line. If the changes are contained within it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4668 we are going to succeed and can update just that one line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4669 Otherwise we fail. If we fail we will have altered the desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4670 structs which could lead to an assertion failure. However, if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4671 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
4672 so we will actually end up being safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4673 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4674 Bufpos new_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4675 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4676 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4677 struct display_line *ddl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4678
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4679 assert (cdl->bufpos == ddl->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4680 assert (cdl->end_bufpos == ddl->end_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4681 assert (cdl->offset == ddl->offset);
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 the last rune is already a continuation glyph, fail.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4684 #### We should be able to handle this better. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4685 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4686 struct display_block *db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4687 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4688 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4689 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4690 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4691
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4692 if (rb->type == RUNE_DGLYPH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4693 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4694 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4695 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4696 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4697
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4698 /* If the line was generated using propagation data, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4699 if (ddl->used_prop_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4700 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4701
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4702 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4703 w->hscroll, &prop, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4704 ddl->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4705
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4706 /* If there is propagated stuff then it is pretty much a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4707 guarantee that more than just the one line is affected. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4708 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4709 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4710 Dynarr_free (prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4711 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4712 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4713
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4714 /* If the last rune is now a continuation glyph, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4715 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4716 struct display_block *db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4717 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4718 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4719 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4720 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4721
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4722 if (rb->type == RUNE_DGLYPH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4723 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4724 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4725 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4726 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4727
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4728 /* If any line position parameters have changed or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4729 cursor has disappeared or disappeared, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4730 if (cdl->ypos != ddl->ypos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4731 || cdl->ascent != ddl->ascent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4732 || cdl->descent != ddl->descent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4733 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4734 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4735 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4736 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4737 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4738
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4739 /* 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
4740 business. Update everything and return success. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4741 if (end_unchanged >= ddl->bufpos && end_unchanged <= ddl->end_bufpos)
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_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4744 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4745 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4746 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4747 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4748 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4750 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4751 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4752 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4753 w->last_point_y[DESIRED_DISP] = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4754 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4755
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4756 redisplay_update_line (w, line, line, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4757 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4759 /* #### For now we just flush the cache until this has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4760 tested. After that is done, this should correct the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4761 cache directly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4762 Dynarr_reset (w->line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4764 /* Adjust the extent changed boundaries to remove any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4765 overlap with the buffer changes since we've just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4766 successfully updated that area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4767 if (extent_beg_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4768 && extent_beg_unchanged >= beg_unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4769 && extent_beg_unchanged < end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4770 extent_beg_unchanged = end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4771
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4772 if (extent_end_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4773 && extent_end_unchanged >= beg_unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4774 && extent_end_unchanged < end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4775 extent_end_unchanged = beg_unchanged - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4776
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4777 if (extent_end_unchanged <= extent_beg_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4778 extent_beg_unchanged = extent_end_unchanged = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4779
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4780 /* This could lead to odd results if it fails, but since the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4781 buffer changes update succeeded this probably will to.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4782 We already know that the extent changes start at or after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4783 the line because we checked before entering the loop. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4784 if (extent_beg_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4785 && extent_end_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4786 && ((extent_beg_unchanged < ddl->bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4787 || (extent_end_unchanged > ddl->end_bufpos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4788 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4789 return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4790 regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4791 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4792 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4793 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4794 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4795 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4796 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4797 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4798
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4799 /* Oh, well. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4800 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4801 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4802
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4803 /* 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
4804 that point is displayed in the middle of the window.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4805 Return the window's new start position. */
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4806
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4807 static Bufpos
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4808 regenerate_window_point_center (struct window *w, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4809 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4810 Bufpos startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4811
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4812 /* We need to make sure that the modeline is generated so that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4813 window height can be calculated correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4814 ensure_modeline_generated (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4815
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4816 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4817 regenerate_window (w, startp, point, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4818 Fset_marker (w->start[type], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4819
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
4820 return startp;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4821 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4822
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4823 /* Given a window and a set of display lines, return a boolean
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4824 indicating whether the given point is contained within. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4825
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4826 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4827 point_visible (struct window *w, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4828 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4829 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4830 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4831 int first_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4832
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4833 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4834 first_line = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4835 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4836 first_line = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4837
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4838 if (Dynarr_length (dla) > first_line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4839 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4840 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4841 struct display_line *dl = Dynarr_atp (dla, first_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4842
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4843 start = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4844 end = BUF_Z (b) - w->window_end_pos[type] - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4845
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4846 if (point >= start && point <= end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4847 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4848 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4849 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4850 dl = Dynarr_atp (dla, Dynarr_length (dla) - 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 if (point >= (dl->bufpos + dl->offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4853 && point <= (dl->end_bufpos + dl->offset))
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
4854 return !dl->clip;
0
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 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4857 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4858 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4859 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4860 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4861 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4862 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4863 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4864 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4865 return 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 pixel position the middle of the window, not including the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4869 modeline and any potential horizontal scrollbar. */
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 window_half_pixpos (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4873 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
4874 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4875 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4876
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4877 /* Return the display line which is currently in the middle of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4878 window W for display lines TYPE. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4879
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4880 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4881 line_at_center (struct window *w, int type, Bufpos start, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4882 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4883 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4884 int half;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4885 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4886 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4887
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4888 if (type == CMOTION_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4889 regenerate_window (w, start, point, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4890
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4891 dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4892 half = window_half_pixpos (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4893
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4894 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4895 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4896 struct display_line *dl = Dynarr_atp (dla, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4897 int line_bot = dl->ypos + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4898
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4899 if (line_bot > half)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4900 return elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4901 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4902
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4903 /* 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
4904 being displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4905 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4906 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4907
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4908 /* Return a value for point that would place it at the beginning of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4909 the line which is in the middle of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4911 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4912 point_at_center (struct window *w, int type, Bufpos start, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4913 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4914 /* line_at_center will regenerate the display structures, if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4915 int line = line_at_center (w, type, start, point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4916
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4917 if (line == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4918 return BUF_ZV (XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4919 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4920 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4921 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4922 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4923
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4924 return dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4925 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4926 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4927
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4928 /* For a given window, ensure that the current visual representation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4929 is accurate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4930
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4931 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4932 redisplay_window (Lisp_Object window, int skip_selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4933 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4934 struct window *w = XWINDOW (window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4935 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4936 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4937 Lisp_Object old_buffer = w->buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4938 struct buffer *b;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4939 int echo_active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4940 int startp = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4941 int pointm;
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4942 int selected_in_its_frame;
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4943 int selected_globally;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4944 int skip_output = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4945 int truncation_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4946 int inactive_minibuffer =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4947 (MINI_WINDOW_P (w) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4948 (f != device_selected_frame (d)) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4949 !is_surrogate_for_selected_frame (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4950
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4951 /* #### In the new world this function actually does a bunch of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4952 optimizations such as buffer-based scrolling, but none of that is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4953 implemented yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4954
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4955 /* If this is a combination window, do its children; that's all.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4956 The selected window is always a leaf so we don't check for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4957 skip_selected here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4958 if (!NILP (w->vchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4959 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4960 redisplay_windows (w->vchild, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4961 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4962 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4963 if (!NILP (w->hchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4964 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4965 redisplay_windows (w->hchild, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4966 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4967 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4969 /* Is this window the selected window on its frame? */
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4970 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4971 selected_globally =
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4972 selected_in_its_frame &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4973 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4974 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4975 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4976 if (skip_selected && selected_in_its_frame)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4977 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4978
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4979 /* It is possible that the window is not fully initialized yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4980 if (NILP (w->buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4981 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4982
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4983 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4984 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4985 w->buffer = Vecho_area_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4986 echo_active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4987 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4988
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4989 b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4990
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4991 if (echo_active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4992 pointm = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4993 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4994 {
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
4995 if (selected_globally)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4996 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4997 pointm = BUF_PT (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4998 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4999 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5000 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5001 pointm = marker_position (w->pointm[CURRENT_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5002
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5003 if (pointm < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5004 pointm = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5005 else if (pointm > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5006 pointm = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5007 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5008 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5009 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), old_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5011 /* If the buffer has changed we have to invalid all of our face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5012 cache elements. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5013 if ((!echo_active && b != window_display_buffer (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5014 || !Dynarr_length (w->face_cachels)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5015 || f->faces_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5016 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5017 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5018 mark_face_cachels_as_not_updated (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5020 /* Ditto the glyph cache elements. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5021 if ((!echo_active && b != window_display_buffer (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5022 || !Dynarr_length (w->glyph_cachels))
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)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5038 startp = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5039 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5040 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5041 startp = marker_position (w->start[CURRENT_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5042 if (startp < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5043 startp = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5044 else if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5045 startp = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5046 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5047 Fset_marker (w->start[DESIRED_DISP], make_int (startp), old_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5049 truncation_changed = (find_window_mirror (w)->truncate_win !=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5050 window_truncation_on (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5051
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5052 /* 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
5053 should display from there and change point, if necessary, to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5054 ensure that it is visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5055 if (w->force_start || inactive_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5056 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5057 w->force_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5058 w->last_modified[DESIRED_DISP] = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5059 w->last_facechange[DESIRED_DISP] = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5060
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5061 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5062
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5063 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5064 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5065 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5066
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5067 if (selected_globally)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5068 BUF_SET_PT (b, pointm);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5069
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5070 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5071 old_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5073 /* #### BUFU amounts of overkil just to get the cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5074 location marked properly. FIX ME FIX ME FIX ME */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5075 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5076 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5077
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5078 goto regeneration_done;
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 /* If nothing has changed since the last redisplay, then we just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5082 need to make sure that point is still visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5083 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5084 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5085 && pointm >= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5086 /* This check is to make sure we restore the minibuffer after a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5087 temporary change to the echo area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5088 && !(MINI_WINDOW_P (w) && f->buffers_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5089 && !f->frame_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5090 && !truncation_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5091 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5092 /* Check if the cursor has actually moved. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5093 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5094 && pointm == marker_position (w->last_point[CURRENT_DISP])
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5095 && selected_globally
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5096 && !w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5097 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5098 && !f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5099 && !f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5100 && !f->point_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5101 && !f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5102 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5103 /* If not, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5104 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5105 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5107 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5108 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5109 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5110 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5111 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5112 /* If the new point is visible in the redisplay structures,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5113 then let the output update routines handle it, otherwise
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5114 do things the hard way. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5115 if (!w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5116 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5117 && !f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5118 && !f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5119 && !f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5120 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5121 if (point_visible (w, pointm, CURRENT_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5122 && w->last_point_x[CURRENT_DISP] != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5123 && w->last_point_y[CURRENT_DISP] != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5124 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5125 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5126 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5127 /* Always regenerate in case it is displaying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5128 the current line or column. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5129 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5131 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5132 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5133 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5134 }
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5135 else if (!selected_in_its_frame && !f->point_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5136 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5137 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5138 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5139
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5140 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5141 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5142 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5143 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5145 /* If we weren't able to take the shortcut method, then use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5146 the brute force method. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5147 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5148
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5149 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5150 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5151 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5152 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5154 /* Check if the starting point is no longer at the beginning of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5155 line, in which case find a new starting point. We also recenter
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5156 if our start position is equal to point-max. Otherwise we'll end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5157 up with a blank window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5158 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5159 && !(startp == BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5160 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5161 || (pointm == startp &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5162 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5163 startp < marker_position (w->last_start[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5164 || (startp == BUF_ZV (b)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5165 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5166 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5168 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5169 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5170 /* See if we can update the data structures locally based on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5171 knowledge of what changed in the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5172 else if (!w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5173 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5174 && !f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5175 && !f->windows_structure_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5176 && !f->frame_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5177 && !truncation_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5178 && pointm >= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5179 && regenerate_window_incrementally (w, startp, pointm))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5180 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5181 if (f->modeline_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5182 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5183 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5184 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5186 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5187 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5188 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5189 /* #### This is where a check for structure based scrolling would go. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5190 /* If all else fails, try just regenerating and see what happens. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5191 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5192 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5193 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5195 if (point_visible (w, pointm, DESIRED_DISP))
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5199 /* We still haven't gotten the window regenerated with point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5200 visible. Next we try scrolling a little and see if point comes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5201 back onto the screen. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5202 if (scroll_step)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5203 {
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5204 int scrolled = scroll_conservatively;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5205 for (; scrolled >= 0; scrolled -= scroll_step)
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5206 {
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5207 startp = vmotion (w, startp,
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5208 (pointm < startp) ? -scroll_step : scroll_step, 0);
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5209 regenerate_window (w, startp, pointm, DESIRED_DISP);
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5210
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5211 if (point_visible (w, pointm, DESIRED_DISP))
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5212 goto regeneration_done;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
5213 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5214 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5216 /* We still haven't managed to get the screen drawn with point on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5217 the screen, so just center it and be done with it. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5218 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5221 regeneration_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5222
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5223 /* If the window's frame is changed then reset the current display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5224 lines in order to force a full repaint. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5225 if (f->frame_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5226 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5227 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5228
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5229 Dynarr_reset (cla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5230 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5232 /* Must do this before calling redisplay_output_window because it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5233 sets some markers on the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5234 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5235 w->buffer = old_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5237 /* These also have to be set before calling redisplay_output_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5238 since it sets the CURRENT_DISP values based on them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5239 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5240 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5241 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5242 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5244 if (!skip_output)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5245 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5246 Bufpos start = marker_position (w->start[DESIRED_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5247 Bufpos end = (w->window_end_pos[DESIRED_DISP] == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5248 ? BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5249 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5251 update_line_start_cache (w, start, end, pointm, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5252 redisplay_output_window (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5253 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5254
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5255 /* #### This should be dependent on face changes and will need to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5256 somewhere else once tty updates occur on a per-frame basis. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5257 mark_face_cachels_as_clean (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5259 w->windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5260 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5262 /* Call buffer_reset_changes for all buffers present in any window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5263 currently visible in all frames on all devices. #### There has to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5264 be a better way to do this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5265
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5266 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5267 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5268 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5269 buffer_reset_changes (XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5270 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5271 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5272
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5273 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5274 reset_buffer_changes (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5275 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5276 Lisp_Object frmcons, devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5278 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5279 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5280 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5281
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5282 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5283 map_windows (f, reset_buffer_changes_mapfun, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5284 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5285 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5286
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5287 /* Ensure that all windows underneath the given window in the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5288 hierarchy are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5289
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5290 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5291 redisplay_windows (Lisp_Object window, int skip_selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5292 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5293 for (; !NILP (window) ; window = XWINDOW (window)->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5294 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5295 redisplay_window (window, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5296 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5297 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5299 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5300 call_redisplay_end_triggers (struct window *w, void *closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5301 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5302 Bufpos lrpos = w->last_redisplay_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5303 w->last_redisplay_pos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5304 if (!NILP (w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5305 && !NILP (w->redisplay_end_trigger)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5306 && lrpos > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5307 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5308 Bufpos pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5309
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5310 if (MARKERP (w->redisplay_end_trigger)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5311 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5312 pos = marker_position (w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5313 else if (INTP (w->redisplay_end_trigger))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5314 pos = XINT (w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5315 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5316 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5317 w->redisplay_end_trigger = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5318 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5319 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5321 if (lrpos >= pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5322 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5323 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5324 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5325 va_run_hook_with_args_in_buffer (XBUFFER (w->buffer),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5326 Qredisplay_end_trigger_functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5327 2, window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5328 w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5329 w->redisplay_end_trigger = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5330 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5331 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5333 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5334 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5336 /* Ensure that all windows on the given frame are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5337
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5338 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5339 redisplay_frame (struct frame *f, int preemption_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5340 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5341 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5343 if (preemption_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5344 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5345 /* The preemption check itself takes a lot of time,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5346 so normally don't do it here. We do it if called
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5347 from Lisp, though (`redisplay-frame'). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5348 int preempted;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5350 REDISPLAY_PREEMPTION_CHECK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5351 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5352 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5353 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5355 /* Before we put a hold on frame size changes, attempt to process
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5356 any which are already pending. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5357 if (f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5358 change_frame_size (f, f->new_height, f->new_width, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5360 /* The menubar, toolbar, and icon updates must be done before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5361 hold_frame_size_changes is called and we are officially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5362 'in_display'. They may eval lisp code which may call Fsignal.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5363 If in_display is set Fsignal will abort. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5364
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5365 #ifdef HAVE_MENUBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5366 /* Update the menubar. It is done first since it could change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5367 the menubar's visibility. This way we avoid having flashing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5368 caused by an Expose event generated by the visibility change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5369 being handled. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5370 update_frame_menubars (f);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5371 #endif /* HAVE_MENUBARS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5372
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5373 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5374 /* Update the toolbars. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5375 update_frame_toolbars (f);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5376 #endif /* HAVE_TOOLBARS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5378 hold_frame_size_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5379
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5380 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5381 /* Within this section, we are defenseless and assume that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5382 following cannot happen:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5383
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5384 1) garbage collection
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5385 2) Lisp code evaluation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5386 3) frame size changes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5387
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5388 We ensure (3) by calling hold_frame_size_changes(), which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5389 will cause any pending frame size changes to get put on hold
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5390 till after the end of the critical section. (1) follows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5391 automatically if (2) is met. #### Unfortunately, there are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5392 some places where Lisp code can be called within this section.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5393 We need to remove them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5394
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5395 If Fsignal() is called during this critical section, we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5396 will abort().
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5397
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5398 If garbage collection is called during this critical section,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5399 we simply return. #### We should abort instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5401 #### If a frame-size change does occur we should probably
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5402 actually be preempting redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5404 /* 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
5405 if (f->clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5406 f->frame_changed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5408 /* Erase the frame before outputting its contents. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5409 if (f->clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5410 DEVMETH (d, clear_frame, (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5412 /* Do the selected window first. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5413 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5414
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5415 /* Then do the rest. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5416 redisplay_windows (f->root_window, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5417
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5418 /* We now call the output_end routine for tty frames. We delay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5419 doing so in order to avoid cursor flicker. So much for 100%
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5420 encapsulation. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5421 if (FRAME_TTY_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5422 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5423
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5424 update_frame_title (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5425
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5426 f->buffers_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5427 f->clip_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5428 f->extents_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5429 f->faces_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5430 f->frame_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5431 f->icon_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5432 f->menubar_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5433 f->modeline_changed = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5434 f->point_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5435 f->toolbar_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5436 f->windows_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5437 f->windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5438 f->window_face_cache_reset = 0;
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
5439 f->echo_area_garbaged = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5441 f->clear = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5442
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5443 if (!f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5444 f->size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5445
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5446 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5448 /* Allow frame size changes to occur again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5450 #### what happens if changes to other frames happen? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5451 unhold_one_frame_size_changes (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5453 map_windows (f, call_redisplay_end_triggers, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5454 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5455 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5456
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5457 /* Ensure that all frames on the given device are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5458
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5459 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5460 redisplay_device (struct device *d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5461 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5462 Lisp_Object frame, frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5463 int preempted = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5464 int size_change_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5465 struct frame *f;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5466
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5467 if (DEVICE_STREAM_P (d)) /* nothing to do */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5468 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5469
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5470 /* It is possible that redisplay has been called before the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5471 device is fully initialized. If so then continue with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5472 next device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5473 if (NILP (DEVICE_SELECTED_FRAME (d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5474 return 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 REDISPLAY_PREEMPTION_CHECK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5477 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5478 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5479
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5480 /* Always do the selected frame first. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5481 frame = DEVICE_SELECTED_FRAME (d);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5482
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5483 f = XFRAME (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5484
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5485 if (f->icon_changed || f->windows_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5486 update_frame_icon (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5487
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5488 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5489 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5490 if (f->buffers_changed || f->clip_changed || f->extents_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5491 f->faces_changed || f->frame_changed || f->menubar_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5492 f->modeline_changed || f->point_changed || f->size_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5493 f->toolbar_changed || f->windows_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5494 f->windows_structure_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5495 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5496 preempted = redisplay_frame (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5497 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5498
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5499 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5500 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5502 /* If the frame redisplay did not get preempted, then this flag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5503 should have gotten set to 0. It might be possible for that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5504 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
5505 time. To make sure we don't miss anything we simply don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5506 reset the top level flags until the condition ends up being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5507 in the right state. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5508 if (f->size_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5509 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5510 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5512 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5513 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5514 f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5516 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5517 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5519 if (f->icon_changed || f->windows_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5520 update_frame_icon (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5521
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5522 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5523 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5524 if (f->buffers_changed || f->clip_changed || f->extents_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5525 f->faces_changed || f->frame_changed || f->menubar_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5526 f->modeline_changed || f->point_changed || f->size_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5527 f->toolbar_changed || f->windows_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5528 f->windows_structure_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5529 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5530 preempted = redisplay_frame (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5531 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5532
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5533 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5534 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5535
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5536 if (f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5537 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5538 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5539 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5540
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5541 /* If we get here then we redisplayed all of our frames without
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5542 getting preempted so mark ourselves as clean. */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5543 d->buffers_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5544 d->clip_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5545 d->extents_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5546 d->faces_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5547 d->frame_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5548 d->icon_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5549 d->menubar_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5550 d->modeline_changed = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5551 d->point_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5552 d->toolbar_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5553 d->windows_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5554 d->windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5556 if (!size_change_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5557 d->size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5559 return 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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5562 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5563 restore_profiling_redisplay_flag (Lisp_Object val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5564 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5565 profiling_redisplay_flag = XINT (val);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5566 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5567 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5568
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5569 /* Ensure that all windows on all frames on all devices are displaying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5570 the current contents of their respective buffers. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5571
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5572 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5573 redisplay_without_hooks (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5574 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5575 Lisp_Object devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5576 int size_change_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5577 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5578
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5579 if (profiling_active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5580 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5581 record_unwind_protect (restore_profiling_redisplay_flag,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5582 make_int (profiling_redisplay_flag));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5583 profiling_redisplay_flag = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5584 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5586 if (asynch_device_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5587 handle_asynch_device_change ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5588
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5589 if (!buffers_changed && !clip_changed && !extents_changed &&
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5590 !faces_changed && !frame_changed && !icon_changed &&
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5591 !menubar_changed && !modeline_changed && !point_changed &&
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5592 !size_changed && !toolbar_changed && !windows_changed &&
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5593 !windows_structure_changed && !disable_preemption &&
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5594 preemption_count < max_preempts)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5595 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5596
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5597 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5598 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5599 struct device *d = XDEVICE (XCAR (devcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5600 int preempted;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5601
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5602 if (d->buffers_changed || d->clip_changed || d->extents_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5603 d->faces_changed || d->frame_changed || d->icon_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5604 d->menubar_changed || d->modeline_changed || d->point_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5605 d->size_changed || d->toolbar_changed || d->windows_changed ||
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5606 d->windows_structure_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5607 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5608 preempted = redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5610 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5611 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5612 preemption_count++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5613 RESET_CHANGED_SET_FLAGS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5614 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5615 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5617 /* See comment in redisplay_device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5618 if (d->size_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5619 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5620 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5621 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5622 preemption_count = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5623
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5624 /* Mark redisplay as accurate */
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5625 buffers_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5626 clip_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5627 extents_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5628 frame_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5629 icon_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5630 menubar_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5631 modeline_changed = 0;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5632 point_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5633 toolbar_changed = 0;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5634 windows_changed = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5635 windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5636 RESET_CHANGED_SET_FLAGS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5637
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5638 if (faces_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5639 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5640 mark_all_faces_as_clean ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5641 faces_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5642 }
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 (!size_change_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5645 size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5647 reset_buffer_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5648
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5649 done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5650 unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5651 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5652
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5653 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5654 redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5655 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5656 if (last_display_warning_tick != display_warning_tick &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5657 !inhibit_warning_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5658 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5659 /* If an error occurs during this function, oh well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5660 If we report another warning, we could get stuck in an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5661 infinite loop reporting warnings. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5662 call0_trapping_errors (0, Qdisplay_warning_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5663 last_display_warning_tick = display_warning_tick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5664 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5665 /* The run_hook_trapping_errors functions are smart enough not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5666 to do any evalling if the hook function is empty, so there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5667 should not be any significant time loss. All places in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5668 C code that call redisplay() are prepared to handle GCing,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5669 so we should be OK. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5670 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5671 run_hook_trapping_errors ("Error in pre-redisplay-hook",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5672 Qpre_redisplay_hook);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5673 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5674
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5675 redisplay_without_hooks ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5676
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5677 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5678 run_hook_trapping_errors ("Error in post-redisplay-hook",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5679 Qpost_redisplay_hook);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5680 #endif /* INHIBIT_REDISPLAY_HOOKS */
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
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5683
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5684 static char window_line_number_buf[16];
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5685
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5686 /* Efficiently determine the window line number, and return a pointer
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5687 to its printed representation. Do this regardless of whether
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5688 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
5689 1. If narrowing is in effect, the lines are counted from the
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5690 beginning of the visible portion of the buffer. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5691 static char *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5692 window_line_number (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5693 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5694 struct device *d = XDEVICE (XFRAME (w->frame)->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5695 struct buffer *b = XBUFFER (w->buffer);
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5696 Bufpos pos =
151
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5697 (((w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d)))) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5698 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5699 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
59463afc5666 Import from CVS: tag r20-3b2
cvs
parents: 149
diff changeset
5700 EQ(DEVICE_SELECTED_FRAME(d), w->frame))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5701 ? BUF_PT (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5702 : marker_position (w->pointm[type]));
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5703 EMACS_INT line;
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5704
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5705 line = buffer_line_number (b, pos, 1);
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5706
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5707 sprintf (window_line_number_buf, "%d", line + 1);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5708
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
5709 return window_line_number_buf;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5710 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5711
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 209
diff changeset
5712
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5713 /* Given a character representing an object in a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5714 specification, return a string (stored into the global array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5715 `mode_spec_bufbyte_string') with the information that object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5716 represents.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5717
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5718 This function is largely unchanged from previous versions of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5719 redisplay engine. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5720
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5721 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5722 decode_mode_spec (struct window *w, Emchar spec, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5723 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5724 Lisp_Object obj = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5725 CONST char *str = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5726 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5727
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5728 Dynarr_reset (mode_spec_bufbyte_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5729
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5730 switch (spec)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5731 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5732 /* print buffer name */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5733 case 'b':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5734 obj = b->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5735 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5736
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5737 /* print visited file name */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5738 case 'f':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5739 obj = b->filename;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5740 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5742 /* print the current column */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5743 case 'c':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5744 {
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
5745 int col = current_column (b) + (column_number_start_at_one != 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5746 int temp = col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5747 int size = 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5748 char *buf;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5750 while (temp >= 10)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5751 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5752 temp /= 10;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5753 size++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5754 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5755
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5756 buf = alloca_array (char, size);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5757 sprintf (buf, "%d", col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5759 Dynarr_add_many (mode_spec_bufbyte_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5760 (CONST Bufbyte *) buf, strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5761
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5762 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5763 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5764
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5765 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5766 /* print the file coding system */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5767 case 'C':
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5768 {
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
5769 Lisp_Object codesys = b->buffer_file_coding_system;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5770 /* Be very careful here not to get an error. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5771 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5772 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5773 codesys = Ffind_coding_system (codesys);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5774 if (CODING_SYSTEMP (codesys))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5775 obj = Fcoding_system_property (codesys, Qmnemonic);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5776 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5777 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5778 break;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5779 #endif /* MULE */
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5780
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5781 /* print the current line number */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5782 case 'l':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5783 str = window_line_number (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5784 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5785
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5786 /* print value of mode-name (obsolete) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5787 case 'm':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5788 obj = b->mode_name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5789 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5790
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5791 /* print hyphen and frame number, if != 1 */
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5792 case 'N':
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5793 #ifdef HAVE_TTY
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5794 {
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5795 struct frame *f = XFRAME (w->frame);
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5796 if (FRAME_TTY_P (f) && f->order_count > 1)
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5797 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
5798 str = (CONST char *) alloca (10);
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5799 sprintf (str, "-%d", f->order_count);
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5800 }
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5801 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5802 #endif /* HAVE_TTY */
149
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5803 break;
538048ae2ab8 Import from CVS: tag r20-3b1
cvs
parents: 142
diff changeset
5804
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5805 /* print Narrow if appropriate */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5806 case 'n':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5807 if (BUF_BEGV (b) > BUF_BEG (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5808 || BUF_ZV (b) < BUF_Z (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5809 str = " Narrow";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5810 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5811
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5812 /* print %, * or hyphen, if buffer is read-only, modified or neither */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5813 case '*':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5814 str = (!NILP (b->read_only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5815 ? "%"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5816 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5817 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5818 : "-"));
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 * or hyphen -- XEmacs change to allow a buffer to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5822 read-only but still indicate whether it is modified. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5823 case '+':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5824 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5825 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5826 : (!NILP (b->read_only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5827 ? "%"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5828 : "-"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5829 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5830
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5831 /* #### defined in 19.29 decode_mode_spec, but not in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5832 modeline-format doc string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5833 /* This differs from %* in that it ignores read-only-ness. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5834 case '&':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5835 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5836 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5837 : "-");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5838 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5839
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5840 /* print process status */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5841 case 's':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5842 obj = Fget_buffer_process (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5843 if (NILP (obj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5844 str = GETTEXT ("no process");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5845 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5846 obj = Fsymbol_name (Fprocess_status (obj));
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
227
0e522484dd2a Import from CVS: tag r20-5b12
cvs
parents: 223
diff changeset
5849 /* Print name of selected frame. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5850 case 'S':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5851 obj = XFRAME (w->frame)->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5852 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5854 /* indicate TEXT or BINARY */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5855 case 't':
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
5856 #ifdef DOS_NT
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5857 str = NILP (b->buffer_file_type) ? "T" : "B";
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
5858 #else /* not DOS_NT */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5859 str = "T";
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
5860 #endif /* not DOS_NT */
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5861 break;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5862
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5863 /* print percent of buffer above top of window, or Top, Bot or All */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5864 case 'p':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5865 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5866 Bufpos pos = marker_position (w->start[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5867 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5868
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5869 /* This had better be while the desired lines are being done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5870 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5871 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5872 if (pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5873 str = "All";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5874 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5875 str = "Bottom";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5876 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5877 else if (pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5878 str = "Top";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5879 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5880 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5881 /* This hard limit is ok since the string it will hold has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5882 fixed maximum length of 3. But just to be safe... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5883 char buf[10];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5884
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5885 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5887 /* We can't normally display a 3-digit number, so get us a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5888 2-digit number that is close. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5889 if (total == 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5890 total = 99;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5891
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5892 sprintf (buf, "%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5893 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5894 strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5895
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5896 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5897 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5898 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5899 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5900
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5901 /* print percent of buffer above bottom of window, perhaps plus
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5902 Top, or print Bottom or All */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5903 case 'P':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5904 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5905 Bufpos toppos = marker_position (w->start[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5906 Bufpos botpos = BUF_Z (b) - w->window_end_pos[type];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5907 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5908
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5909 /* 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
5910 only treat it as a hint. In particular, after erase-buffer,
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5911 botpos may be negative. */
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5912 if (botpos < toppos)
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5913 botpos = toppos;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
5914
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5915 if (botpos >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5916 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5917 if (toppos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5918 str = "All";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5919 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5920 str = "Bottom";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5921 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5922 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5923 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5924 /* This hard limit is ok since the string it will hold has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5925 fixed maximum length of around 6. But just to be safe... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5926 char buf[10];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5927
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5928 total = ((botpos - BUF_BEGV (b)) * 100 + total - 1) / total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5929
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5930 /* We can't normally display a 3-digit number, so get us a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5931 2-digit number that is close. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5932 if (total == 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5933 total = 99;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5934
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5935 if (toppos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5936 sprintf (buf, "Top%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5937 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5938 sprintf (buf, "%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5939
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5940 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5941 strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5942
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5943 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5944 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5945 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5946 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5947
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5948 /* print % */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5949 case '%':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5950 str = "%";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5951 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5953 /* print one [ for each recursive editing level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5954 case '[':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5955 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5956 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5957
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5958 if (command_loop_level > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5959 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5960 str = "[[[... ";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5961 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5962 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5964 for (i = 0; i < command_loop_level; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5965 Dynarr_add (mode_spec_bufbyte_string, '[');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5966
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5967 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5968 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5969
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5970 /* print one ] for each recursive editing level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5971 case ']':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5972 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5973 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5975 if (command_loop_level > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5976 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5977 str = "...]]]";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5978 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5979 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5980
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5981 for (i = 0; i < command_loop_level; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5982 Dynarr_add (mode_spec_bufbyte_string, ']');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5983
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5984 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5985 }
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 infinitely many dashes -- handle at top level now */
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 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5990
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5991 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5992
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5993 if (STRINGP (obj))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5994 Dynarr_add_many (mode_spec_bufbyte_string,
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5995 XSTRING_DATA (obj),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5996 XSTRING_LENGTH (obj));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5997 else if (str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5998 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) str, strlen (str));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6000 decode_mode_spec_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6001 Dynarr_add (mode_spec_bufbyte_string, '\0');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6002 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6003
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
6004 /* Given a display line, free all of its data structures. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6005
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6006 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6007 free_display_line (struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6008 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6009 int block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6011 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6012 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6013 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6014 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6015 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6016
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6017 Dynarr_free (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6018 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6020 Dynarr_free (dl->display_blocks);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6021 dl->display_blocks = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6022 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6023
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6024 if (dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6025 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6026 Dynarr_free (dl->left_glyphs);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6027 dl->left_glyphs = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6028 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6029
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6030 if (dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6031 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6032 Dynarr_free (dl->right_glyphs);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6033 dl->right_glyphs = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6034 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6035 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6038 /* Given an array of display lines, free them and all data structures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6039 contained within them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6040
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6041 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6042 free_display_lines (display_line_dynarr *dla)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6043 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6044 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6045
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6046 for (line = 0; line < Dynarr_largest (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6047 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6048 free_display_line (Dynarr_atp (dla, line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6049 }
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 (dla);
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 /* Call internal free routine for each set of display lines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6055
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6056 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6057 free_display_structs (struct window_mirror *mir)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6058 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6059 if (mir->current_display_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6060 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6061 free_display_lines (mir->current_display_lines);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6062 mir->current_display_lines = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6063 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6064
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6065 if (mir->desired_display_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6066 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6067 free_display_lines (mir->desired_display_lines);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6068 mir->desired_display_lines = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6069 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6070 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6073 static void
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6074 mark_glyph_block_dynarr (glyph_block_dynarr *gba, void (*markobj) (Lisp_Object))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6075 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6076 if (gba)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6077 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6078 glyph_block *gb = Dynarr_atp (gba, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6079 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6080
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6081 for (; gb < gb_last; gb++)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6082 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6083 if (!NILP (gb->glyph)) ((markobj) (gb->glyph));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6084 if (!NILP (gb->extent)) ((markobj) (gb->extent));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6085 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6086 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6087 }
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6088
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6089 static void
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6090 mark_redisplay_structs (display_line_dynarr *dla, void (*markobj) (Lisp_Object))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6091 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6092 display_line *dl = Dynarr_atp (dla, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6093 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6094
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6095 for (; dl < dl_last; dl++)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6096 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6097 display_block_dynarr *dba = dl->display_blocks;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6098 display_block *db = Dynarr_atp (dba, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6099 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6100
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6101 for (; db < db_last; db++)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6102 {
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6103 rune_dynarr *ra = db->runes;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6104 rune *r = Dynarr_atp (ra, 0);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6105 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6106
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6107 for (; r < r_last; r++)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6108 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6109 if (r->type == RUNE_DGLYPH)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6110 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6111 if (!NILP (r->object.dglyph.glyph))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6112 ((markobj) (r->object.dglyph.glyph));
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6113 if (!NILP (r->object.dglyph.extent))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6114 ((markobj) (r->object.dglyph.extent));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6115 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6116 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6117 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6118
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6119 mark_glyph_block_dynarr (dl->left_glyphs, markobj);
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
6120 mark_glyph_block_dynarr (dl->right_glyphs, markobj);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6121 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6122 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6123
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6124 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6125 mark_window_mirror (struct window_mirror *mir, void (*markobj)(Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6126 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6127 mark_redisplay_structs (mir->current_display_lines, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6128 mark_redisplay_structs (mir->desired_display_lines, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6130 if (mir->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6131 mark_window_mirror (mir->next, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6132
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6133 if (mir->hchild)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6134 mark_window_mirror (mir->hchild, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6135 else if (mir->vchild)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6136 mark_window_mirror (mir->vchild, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6137 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6139 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6140 mark_redisplay (void (*markobj)(Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6141 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6142 Lisp_Object frmcons, devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6143
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6144 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6145 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6146 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6147 update_frame_window_mirror (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6148 mark_window_mirror (f->root_mirror, markobj);
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 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6153 Line Start Cache Description and Rationale
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6155 The traditional scrolling code in Emacs breaks in a variable height world.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6156 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
6157 displayed at any given time is fixed. This led to a complete separation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6158 of the scrolling code from the redisplay code. In order to fully support
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6159 variable height lines, the scrolling code must actually be tightly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6160 integrated with redisplay. Only redisplay can determine how many lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6161 will be displayed on a screen for any given starting point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6163 What is ideally wanted is a complete list of the starting buffer position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6164 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
6165 display line. Maintaining such a full list would be very expensive. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6166 settle for having it include information for all areas which we happen to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6167 generate anyhow (i.e. the region currently being displayed) and for those
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6168 areas we need to work with.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6169
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6170 In order to ensure that the cache accurately represents what redisplay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6171 would actually show, it is necessary to invalidate it in many situations.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6172 If the buffer changes, the starting positions may no longer be correct.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6173 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
6174 These events happen frequently enough that the cache can end up being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6175 constantly disabled. With this potentially constant invalidation when is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6176 the cache ever useful?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6177
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6178 Even if the cache is invalidated before every single usage, it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6179 necessary. Scrolling often requires knowledge about display lines which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6180 are actually above or below the visible region. The cache provides a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6181 convenient light-weight method of storing this information for multiple
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6182 display regions. This knowledge is necessary for the scrolling code to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6183 always obey the First Golden Rule of Redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6185 If the cache already contains all of the information that the scrolling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6186 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
6187 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
6188 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
6189 region had to be generated anyway, so the cache ends up getting the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6190 information basically for free. In those cases where a user is simply
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6191 scrolling around viewing a buffer there is a high probability that this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6192 sufficient to always provide the needed information. The second thing we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6193 can do is be smart about invalidating the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6195 TODO -- Be smart about invalidating the cache. Potential places:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6196
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6197 + 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
6198 starting positions of any display lines. These types of buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6199 modifications should not invalidate the cache. This is actually a large
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6200 optimization for redisplay speed as well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6201
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6202 + Buffer modifications frequently only affect the display of lines at and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6203 below where they occur. In these situations we should only invalidate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6204 the part of the cache starting at where the modification occurs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6205
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6206 In case you're wondering, the Second Golden Rule of Redisplay is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6207 applicable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6208 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6209
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6210 /* 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
6211 allocating and freeing it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6212 line_start_cache_dynarr *internal_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6213
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6214 /* Makes internal_cache represent the TYPE display structs and only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6215 the TYPE display structs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6216
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6217 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6218 update_internal_cache_list (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6219 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6220 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6221 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6222
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6223 Dynarr_reset (internal_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6224 for (line = 0; line < Dynarr_length (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6225 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6226 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6227
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6228 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6229 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6230 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6231 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6232 struct line_start_cache lsc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6234 lsc.start = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6235 lsc.end = dl->end_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6236 lsc.height = dl->ascent + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6237
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6238 Dynarr_add (internal_cache, lsc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6239 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6240 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6241 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6242
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6243 /* Reset the line cache if necessary. This should be run at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6244 beginning of any function which access the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6245
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6246 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6247 validate_line_start_cache (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6248 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6249 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6250 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6251
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6252 if (!w->line_cache_validation_override)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6253 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6254 /* f->extents_changed used to be in here because extent face and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6255 size changes can cause text shifting. However, the extent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6256 covering the region is constantly having its face set and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6257 priority altered by the mouse code. This means that the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6258 start cache is constanty being invalidated. This is bad
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6259 since the mouse code also triggers heavy usage of the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6260 Since it is an unlikely that f->extents being changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6261 indicates that the cache really needs to be updated and if it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6262 does redisplay will catch it pretty quickly we no longer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6263 invalidate the cache if it is set. This greatly speeds up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6264 dragging out regions with the mouse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6265 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6266 || f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6267 || f->clip_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6268 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6269 Dynarr_reset (w->line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6270 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6271 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6272 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6273
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6274 /* Return the very first buffer position contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6275 window's cache, or -1 if the cache is empty. Assumes that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6276 cache is valid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6278 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6279 line_start_cache_start (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6280 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6281 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6282
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6283 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6284 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6285 else
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6286 return Dynarr_atp (cache, 0)->start;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6287 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6289 /* Return the very last buffer position contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6290 window's cache, or -1 if the cache is empty. Assumes that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6291 cache is valid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6292
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6293 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6294 line_start_cache_end (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6295 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6296 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6297
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6298 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6299 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6300 else
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6301 return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6302 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6303
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6304 /* Return the index of the line POINT is contained within in window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6305 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
6306 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
6307 a guarantee of the number of entries in the cache present on either
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6308 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
6309 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
6310 allowed to shift. Returns -1 if POINT cannot be found in the cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6311 for any reason. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6312
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6313 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6314 point_in_line_start_cache (struct window *w, Bufpos point, int min_past)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6315 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6316 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6317 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6318 unsigned int top, bottom, pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6319
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6320 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6321 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6323 /* Let functions pass in negative values, but we still treat -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6324 specially. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6325 /* #### bogosity alert */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6326 if (min_past < 0 && min_past != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6327 min_past = -min_past;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6328
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6329 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6330 || line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6331 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6332 int loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6333 int win_char_height = window_char_height (w, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6334
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6335 /* Occasionally we get here with a 0 height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6336 window. find_next_newline_no_quit will abort if we pass it a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6337 count of 0 so handle that case. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6338 if (!win_char_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6339 win_char_height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6340
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6341 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6342 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6343 Bufpos from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6344 Bufpos to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6346 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6347
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6348 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6349 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6350 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6351 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6352 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6353 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6355 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6356
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6357 loop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6358 while (line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6359 && (loop < cache_adjustment || min_past == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6360 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6361 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6362
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6363 from = line_start_cache_start (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6364 if (from <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6365 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6367 from = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6368 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6370 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6371 loop++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6372 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6373
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6374 if (line_start_cache_start (w) > point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6375 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6376 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6378 from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6379 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6380 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6381 to = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6382 from = to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6383 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6384 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6385 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6386 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6387
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6388 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6389 }
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_end (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 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6398 if (to >= BUF_ZV (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 = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6402 to = find_next_newline_no_quit (b, from, win_char_height);
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_end (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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6426 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6427
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6428 if (min_past == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6429 min_past = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6430
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6431 /* This could happen if the buffer is narrowed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6432 if (line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6433 || line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6434 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6435 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6436 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6437 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6438
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6439 find_point_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 top = Dynarr_length (cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6442 bottom = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6444 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6445 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6446 unsigned int new_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6447 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6449 pos = (bottom + top + 1) >> 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6450 start = Dynarr_atp (cache, pos)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6451 end = Dynarr_atp (cache, pos)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6453 if (point >= start && point <= end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6454 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6455 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6456 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6457 Bufpos from =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6458 find_next_newline_no_quit (b, line_start_cache_start (w),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6459 -min_past - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6460 Bufpos to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6462 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6463 goto find_point_loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6464 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6465 else if ((Dynarr_length (cache) - pos - 1) < min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6466 && line_start_cache_end (w) < BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6467 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6468 Bufpos from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6469 Bufpos to = find_next_newline_no_quit (b, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6470 (min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6471 ? min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6472 : 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6474 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6475 goto find_point_loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6476 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6477 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6478 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6479 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6480 return pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6481 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6482 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6483 else if (point > end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6484 bottom = pos + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6485 else if (point < start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6486 top = pos - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6487 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6488 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6489
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6490 new_pos = (bottom + top + 1) >> 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6491 if (pos == new_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6492 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6493 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6494 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6495 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6496 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6497 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6498
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6499 /* Return a boolean indicating if POINT would be visible in window W
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6500 if display of the window was to begin at STARTP. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6502 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6503 point_would_be_visible (struct window *w, Bufpos startp, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6504 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6505 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6506 int pixpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6507 int bottom = WINDOW_TEXT_HEIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6508 int start_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6509
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6510 /* If point is before the intended start it obviously can't be visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6511 if (point < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6512 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6514 /* If point or start are not in the accessible buffer range, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6515 fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6516 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6517 || point < BUF_BEGV (b) || point > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6518 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6519 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6520 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6521 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6522
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6523 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6524 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6525
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6526 start_elt = point_in_line_start_cache (w, startp, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6527 if (start_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6528 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6529 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6530 return 0;
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 assert (line_start_cache_start (w) <= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6534 && line_start_cache_end (w) >= 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 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6537 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6538 int height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6539
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6540 /* Expand the cache if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6541 if (start_elt == Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6542 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6543 Bufpos old_startp =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6544 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6546 start_elt = point_in_line_start_cache (w, old_startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6547 window_char_height (w, 0));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6549 /* We've already actually processed old_startp, so increment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6550 immediately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6551 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6552
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6553 /* If this happens we didn't add any extra elements. Bummer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6554 if (start_elt == Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6555 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6556 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6557 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6558 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6559 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6560
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6561 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6562
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6563 if (pixpos + height > bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6564 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6565 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6566 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6567 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6568 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6569 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6570 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6571
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6572 pixpos += height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6573 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6574 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6575 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6576 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6577 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6578
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6579 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6580 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6581 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6582
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6583 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6584 the buffer position at the beginning or end of the last line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6585 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
6586 position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6587
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6588 #### With a little work this could probably be reworked as just a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6589 call to start_with_line_at_pixpos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6590
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6591 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6592 start_end_of_last_line (struct window *w, Bufpos startp, int end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6593 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6594 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6595 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6596 int pixpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6597 int bottom = WINDOW_TEXT_HEIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6598 Bufpos cur_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6599 int start_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6601 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6602 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6603
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6604 if (startp < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6605 startp = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6606 else if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6607 startp = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6608 cur_start = startp;
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 = point_in_line_start_cache (w, cur_start, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6611 if (start_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6612 abort (); /* this had better never happen */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6613
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6614 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6615 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6616 int height = Dynarr_atp (cache, start_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6618 cur_start = Dynarr_atp (cache, start_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6619
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6620 if (pixpos + height > bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6621 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6622 /* Adjust for any possible clip. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6623 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6624 start_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6625
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6626 if (start_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6627 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6628 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6629 if (end)
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6630 return BUF_ZV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6631 else
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6632 return BUF_BEGV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6633 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6634 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6635 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6636 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6637 if (end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6638 return Dynarr_atp (cache, start_elt)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6639 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6640 return Dynarr_atp (cache, start_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6641 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6642 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6643
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6644 pixpos += height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6645 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6646 if (start_elt == Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6647 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6648 Bufpos from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6649 int win_char_height = window_char_height (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6650 Bufpos to = find_next_newline_no_quit (b, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6651 (win_char_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6652 ? win_char_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6653 : 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6654
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6655 /* 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
6656 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6657 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6658 w->line_cache_validation_override--;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6659 return BUF_ZV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6660 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6661
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6662 update_line_start_cache (w, from, to, BUF_PT (b), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6663
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6664 /* Updating the cache invalidates any current indexes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6665 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6666 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6667 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6668 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6670 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6671 the buffer position at the beginning of the last line displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6672
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6673 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6674 start_of_last_line (struct window *w, Bufpos startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6675 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6676 return start_end_of_last_line (w, startp, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6677 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6678
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6679 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6680 the buffer position at the end of the last line displayed. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6681 also know as the window end position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6682
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6683 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6684 end_of_last_line (struct window *w, Bufpos startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6685 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6686 return start_end_of_last_line (w, startp, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6687 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6689 /* For window W, what does the starting position have to be so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6690 the line containing POINT will cover pixel position PIXPOS. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6691
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6692 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6693 start_with_line_at_pixpos (struct window *w, Bufpos point, int pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6694 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6695 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6696 int cur_elt;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6697 Bufpos cur_pos, prev_pos = point;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6698 int point_line_height;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6699 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6700
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6701 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6702 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6703
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6704 cur_elt = point_in_line_start_cache (w, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6705 /* #### See comment in update_line_start_cache about big minibuffers. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6706 if (cur_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6707 return point;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6708
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6709 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6710
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6711 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6712 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6713 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6714
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6715 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6716
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6717 /* Do not take into account the value of vertical_clip here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6718 That is the responsibility of the calling functions. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6719 if (pixheight < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6720 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6721 w->line_cache_validation_override--;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6722 if (-pixheight > point_line_height)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6723 /* We can't make the target line cover pixpos, so put it
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6724 above pixpos. That way it will at least be visible. */
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
6725 return prev_pos;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6726 else
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6727 return cur_pos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6728 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6729
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6730 cur_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6731 if (cur_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6732 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6733 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6734 int win_char_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6735
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6736 if (cur_pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6737 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6738 w->line_cache_validation_override--;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6739 return BUF_BEGV (b);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6740 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6742 win_char_height = window_char_height (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6743 if (!win_char_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6744 win_char_height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6745
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6746 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6747 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6748 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6750 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6751 assert (cur_elt >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6752 }
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6753 prev_pos = cur_pos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6754 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6755 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6757 /* For window W, what does the starting position have to be so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6758 the line containing point is on display line LINE. If LINE is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6759 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
6760 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
6761 considered to be the number of lines from the bottom (-1 is the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6762 bottom line). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6764 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6765 start_with_point_on_display_line (struct window *w, Bufpos point, int line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6766 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6767 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6768 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6769
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6770 if (line >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6771 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6772 int cur_elt = point_in_line_start_cache (w, point, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6773
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6774 if (cur_elt - line < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6775 cur_elt = 0; /* Hit the top */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6776 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6777 cur_elt -= line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6779 w->line_cache_validation_override--;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
6780 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6781 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6782 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6783 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6784 /* The calculated value of pixpos is correct for the bottom line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6785 or what we want when line is -1. Therefore we subtract one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6786 because we have already handled one line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6787 int new_line = -line - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6788 int cur_elt = point_in_line_start_cache (w, point, new_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6789 int pixpos = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6790 Bufpos retval, search_point;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6791
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6792 /* If scroll_on_clipped_lines is false, the last "visible" line of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6793 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
6794 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
6795 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
6796 containing point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6797 if (scroll_on_clipped_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6798 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6799 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6800 pixpos -= 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6802 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6803 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6804 /* Hit the bottom of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6805 int adjustment =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6806 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6807 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6808 int defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6809
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6810 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6811 default_face_height_and_width (window, &defheight, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6813 cur_elt = Dynarr_length (w->line_start_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6814
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6815 pixpos -= (adjustment * defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6816 if (pixpos < WINDOW_TEXT_TOP (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6817 pixpos = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6818 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6819 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6820 cur_elt = cur_elt + new_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6821
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6822 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6824 retval = start_with_line_at_pixpos (w, search_point, pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6825 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6826 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6827 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6828 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6830 /* This is used to speed up vertical scrolling by caching the known
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6831 buffer starting positions for display lines. This allows the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6832 scrolling routines to avoid costly calls to regenerate_window. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6833 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
6834 display structs which are in the given range.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6835
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6836 Note also that the FROM/TO values are minimums. It is possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6837 that this function will actually add information outside of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6838 lines containing those positions. This can't hurt but it could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6839 possibly help.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6840
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6841 #### We currently force the cache to have only 1 contiguous region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6842 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
6843 cover more areas. This might, however, turn out to be a lot of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6844 overhead for too little gain. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6845
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6846 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6847 update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6848 Bufpos point, int no_regen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6849 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6850 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6851 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6852 Bufpos low_bound, high_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6854 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6855 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6856 updating_line_start_cache = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6858 if (from < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6859 from = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6860 if (to > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6861 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6862
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6863 if (from > to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6864 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6865 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6866 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6867 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6868 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6869
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6870 if (Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6871 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6872 low_bound = line_start_cache_start (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6873 high_bound = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6874
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6875 /* Check to see if the desired range is already in the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6876 if (from >= low_bound && to <= high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6877 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6878 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6879 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6880 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6881 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6882
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6883 /* Check to make sure that the desired range is adjacent to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6884 current cache. If not, invalidate the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6885 if (to < low_bound || from > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6886 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6887 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6888 low_bound = high_bound = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6889 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6890 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6891 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6892 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6893 low_bound = high_bound = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6894 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6895
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6896 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6898 /* This could be integrated into the next two sections, but it is easier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6899 to follow what's going on by having it separate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6900 if (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 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6903
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6904 update_internal_cache_list (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6905 if (!Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6906 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6907 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6908 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6909 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6910 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6911
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6912 start = Dynarr_atp (internal_cache, 0)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6913 end =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6914 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6915
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6916 /* We aren't allowed to generate additional information to fill in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6917 gaps, so if the DESIRED structs don't overlap the cache, reset the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6918 cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6919 if (Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6920 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6921 if (end < low_bound || start > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6922 Dynarr_reset (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 /* #### What should really happen if what we are doing is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6925 extending a line (the last line)? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6926 if (Dynarr_length (cache) == 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6927 && Dynarr_length (internal_cache) == 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6928 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6929 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6930
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6931 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6932 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6933 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6934 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6935 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6936 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6937 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6938 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6939
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6940 /* An extra check just in case the calling function didn't pass in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6941 the bounds of the DESIRED structs in the first place. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6942 if (start >= low_bound && end <= high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6943 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6944 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6945 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6946 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6947 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6948
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6949 /* At this point we know that the internal cache partially overlaps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6950 the main cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6951 if (start < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6952 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6953 int ic_elt = Dynarr_length (internal_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6954 while (ic_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6955 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6956 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6957 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6958 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6959 ic_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6960 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6962 if (!(ic_elt >= 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6963 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6964 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6965 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6966 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6967 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6968 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6969 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6970 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6971
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6972 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6973 ic_elt + 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6974 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6975
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6976 if (end > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6977 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6978 int ic_elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6979
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6980 while (ic_elt < Dynarr_length (internal_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 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6983 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6984 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6985 ic_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6986 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6988 if (!(ic_elt < Dynarr_length (internal_cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6989 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6990 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6991 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6992 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6993 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6994 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6995 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6996 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6997
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6998 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6999 Dynarr_length (internal_cache) - ic_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7000 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7002 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7003 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7004 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7005 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7006
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7007 if (!Dynarr_length (cache) || from < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7008 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7009 Bufpos startp = find_next_newline_no_quit (b, from, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7010 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7011 int old_lb = low_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7012
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7013 while (startp < old_lb || low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7014 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7015 int ic_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7016
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7017 regenerate_window (w, startp, point, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7018 update_internal_cache_list (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7020 /* If this assert is triggered then regenerate_window failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7021 to layout a single line. That is not supposed to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7022 possible because we impose a minimum height on the buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7023 and override vertical clip when we are in here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7024 /* #### Ah, but it is because the window may temporarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7025 exist but not have any lines at all if the minibuffer is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7026 real big. Look into that situation better. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7027 if (!Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7028 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7029 if (old_lb == -1 && low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7030 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7031 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7032 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7033 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7034 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7035
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7036 assert (Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7037 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7038 assert (startp == Dynarr_atp (internal_cache, 0)->start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7039
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7040 ic_elt = Dynarr_length (internal_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7041 if (low_bound != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7042 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7043 while (ic_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7044 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7045 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7046 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7047 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7048 ic_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7049 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7050 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7051 assert (ic_elt >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7052
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7053 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7054 ic_elt + 1, marker);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7055 marker += (ic_elt + 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7056
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7057 if (startp < low_bound || low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7058 low_bound = startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7059 startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7060 if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7061 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7062 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7063 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7064 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7065 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7066 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7067 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7068
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7069 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7070 assert (from >= low_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7072 /* Readjust the high_bound to account for any changes made while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7073 correcting the low_bound. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7074 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7075
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7076 if (to > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7077 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7078 Bufpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7079
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7080 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7081 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7082 regenerate_window (w, startp, point, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7083 update_internal_cache_list (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7084
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7085 /* See comment above about regenerate_window failing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7086 assert (Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7087
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7088 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7089 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7090 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7091 startp = high_bound + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7092 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7093 while (to > high_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7094 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7095
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7096 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7097 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7098 assert (to <= high_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7099 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7102 /* Given x and y coordinates in characters, relative to a window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7103 return the pixel location corresponding to those coordinates. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7104 pixel location returned is the center of the given character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7105 position. The pixel values are generated relative to the window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7106 not the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7107
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7108 The modeline is considered to be part of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7109
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7110 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7111 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7112 int *pix_x, int *pix_y)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7114 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7115 int num_disp_lines, modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7116 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7117 int defheight, defwidth;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7119 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7120 default_face_height_and_width (window, &defheight, &defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7121
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7122 /* 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
7123 the window, use the first window line or character position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7124 instead. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7125 if (char_y < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7126 char_y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7127 if (char_x < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7128 char_x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7130 num_disp_lines = Dynarr_length (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7131 modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7132 if (num_disp_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7133 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7134 if (Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7135 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7136 num_disp_lines--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7137 modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7138 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7139 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7140
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7141 /* First check if the y position intersects the display lines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7142 if (char_y < num_disp_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7143 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7144 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7145 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7146
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7147 *pix_y = (dl->ypos - dl->ascent +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7148 ((unsigned int) (dl->ascent + dl->descent - dl->clip) >> 1));
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 (char_x < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7151 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7152 struct rune *rb = Dynarr_atp (db->runes, char_x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7154 *pix_x = rb->xpos + (rb->width >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7155 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7156 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7157 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7158 int last_rune = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7159 struct rune *rb = Dynarr_atp (db->runes, last_rune);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7160
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7161 char_x -= last_rune;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7163 *pix_x = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7164 *pix_x += ((char_x - 1) * defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7165 *pix_x += (defwidth >> 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 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7168 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7169 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7170 /* It didn't intersect, so extrapolate. #### For now, we include the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7171 modeline in this since we don't have true character positions in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7172 it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7174 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7175 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7177 char_y -= num_disp_lines;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7179 if (Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7180 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7181 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7182 *pix_y = dl->ypos + dl->descent - dl->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7183 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7184 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7185 *pix_y = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7186
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7187 *pix_y += (char_y * defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7188 *pix_y += (defheight >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7190 *pix_x = WINDOW_TEXT_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7191 /* Don't adjust by one because this is still the unadjusted value. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7192 *pix_x += (char_x * defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7193 *pix_x += (defwidth >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7194 }
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 (*pix_x > w->pixel_left + w->pixel_width)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
7197 *pix_x = w->pixel_left + w->pixel_width;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7198 if (*pix_y > w->pixel_top + w->pixel_height)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
7199 *pix_y = w->pixel_top + w->pixel_height;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7201 *pix_x -= w->pixel_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7202 *pix_y -= w->pixel_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7203 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7204
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7205 /* Given a display line and a position, determine if there is a glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7206 there and return information about it if there is. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7208 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7209 get_position_object (struct display_line *dl, Lisp_Object *obj1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7210 Lisp_Object *obj2, int x_coord, int *low_x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7211 int *high_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7212 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7213 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7214 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7215 int block =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7216 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7218 /* We use get_next_display_block to get the actual display block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7219 that would be displayed at x_coord. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7221 if (block == NO_BLOCK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7222 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7223 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7224 db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7225
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7226 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7227 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7228 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7230 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7231 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7232 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7233 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7234 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7235 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7236 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7237 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7238 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7239 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7240 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7241 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7242
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7243 if (low_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7244 *low_x_coord = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7245 if (high_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7246 *high_x_coord = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7248 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7249 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7250 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7251 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7252
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7253 #define UPDATE_CACHE_RETURN \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7254 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7255 d->pixel_to_glyph_cache.valid = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7256 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7257 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7258 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7259 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7260 d->pixel_to_glyph_cache.frame = f; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7261 d->pixel_to_glyph_cache.col = *col; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7262 d->pixel_to_glyph_cache.row = *row; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7263 d->pixel_to_glyph_cache.obj_x = *obj_x; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7264 d->pixel_to_glyph_cache.obj_y = *obj_y; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7265 d->pixel_to_glyph_cache.w = *w; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7266 d->pixel_to_glyph_cache.bufpos = *bufpos; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7267 d->pixel_to_glyph_cache.closest = *closest; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7268 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7269 d->pixel_to_glyph_cache.obj1 = *obj1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7270 d->pixel_to_glyph_cache.obj2 = *obj2; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7271 d->pixel_to_glyph_cache.retval = position; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7272 RETURN__ position; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7273 } while (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 /* Given x and y coordinates in pixels relative to a frame, return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7276 information about what is located under those coordinates.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7278 The return value will be one of:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7280 OVER_TOOLBAR: over one of the 4 frame toolbars
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7281 OVER_MODELINE: over a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7282 OVER_BORDER: over an internal border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7283 OVER_NOTHING: over the text area, but not over text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7284 OVER_OUTSIDE: outside of the frame border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7285 OVER_TEXT: over text in the text area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7286
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7287 OBJ1 is one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7289 -- a toolbar button
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7290 -- a glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7291 -- nil if the coordinates are not over a glyph or a toolbar button.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7292
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7293 OBJ2 is one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7295 -- an extent, if the coordinates are over a glyph in the text area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7296 -- nil otherwise.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7297
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7298 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
7299 equivalent coordinates relative to the upper-left corner of the glyph.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7300
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7301 If the coordinates are over a character, OBJ_X and OBJ_Y give the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7302 equivalent coordinates relative to the upper-left corner of the character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7303
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7304 Otherwise, OBJ_X and OBJ_Y are undefined.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7305 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7307 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7308 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7309 int *col, int *row, int *obj_x, int *obj_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7310 struct window **w, Bufpos *bufpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7311 Bufpos *closest, Charcount *modeline_closest,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7312 Lisp_Object *obj1, Lisp_Object *obj2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7313 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7314 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7315 struct pixel_to_glyph_translation_cache *cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7316 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7317 int frm_left, frm_right, frm_top, frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7318 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7319 int position = OVER_NOTHING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7320 int device_check_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7321 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7323 /* 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
7324 the middle of being deleted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7325 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7326 {
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7327 device_check_failed = 1;
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7328 d = NULL, cache = NULL; /* Warning suppression */
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 157
diff changeset
7329 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7330 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7331 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7332 d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7333 cache = &d->pixel_to_glyph_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7334 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7336 if (!device_check_failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7337 && cache->valid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7338 && cache->frame == f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7339 && cache->low_x_coord <= x_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7340 && cache->high_x_coord > x_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7341 && cache->low_y_coord <= y_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7342 && cache->high_y_coord > y_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7343 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7344 *col = cache->col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7345 *row = cache->row;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7346 *obj_x = cache->obj_x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7347 *obj_y = cache->obj_y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7348 *w = cache->w;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7349 *bufpos = cache->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7350 *closest = cache->closest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7351 *modeline_closest = cache->modeline_closest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7352 *obj1 = cache->obj1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7353 *obj2 = cache->obj2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7355 return cache->retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7356 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7357 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7358 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7359 *col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7360 *row = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7361 *obj_x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7362 *obj_y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7363 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7364 *bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7365 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7366 *modeline_closest = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7367 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7368 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7370 low_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7371 high_x_coord = x_coord + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7372 low_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7373 high_y_coord = y_coord + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7374 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7376 if (device_check_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7377 return OVER_NOTHING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7379 frm_left = FRAME_LEFT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7380 frm_right = FRAME_RIGHT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7381 frm_top = FRAME_TOP_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7382 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7383
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7384 /* Check if the mouse is outside of the text area actually used by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7385 redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7386 if (y_coord < frm_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7387 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7388 if (y_coord >= FRAME_TOP_BORDER_START (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7389 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7390 low_y_coord = FRAME_TOP_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7391 high_y_coord = frm_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7392 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7393 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7394 else if (y_coord >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7395 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7396 low_y_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7397 high_y_coord = FRAME_TOP_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7398 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7399 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7400 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7401 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7402 low_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7403 high_y_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7404 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7405 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7406 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7407 else if (y_coord >= frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7408 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7409 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7410 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7411 low_y_coord = frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7412 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7413 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7414 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7415 else if (y_coord < FRAME_PIXHEIGHT (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7416 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7417 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7418 high_y_coord = FRAME_PIXHEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7419 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7420 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7421 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7422 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7423 low_y_coord = FRAME_PIXHEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7424 high_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7425 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7426 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7427 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7428
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7429 if (position != OVER_TOOLBAR && position != OVER_BORDER)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7430 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7431 if (x_coord < frm_left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7432 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7433 if (x_coord >= FRAME_LEFT_BORDER_START (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7434 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7435 low_x_coord = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7436 high_x_coord = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7437 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7438 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7439 else if (x_coord >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7440 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7441 low_x_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7442 high_x_coord = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7443 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7444 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7445 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7446 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7447 low_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7448 high_x_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7449 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7450 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7451 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7452 else if (x_coord >= frm_right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7453 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7454 if (x_coord < FRAME_RIGHT_BORDER_END (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7455 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7456 low_x_coord = frm_right;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7457 high_x_coord = FRAME_RIGHT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7458 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7459 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7460 else if (x_coord < FRAME_PIXWIDTH (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7461 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7462 low_x_coord = FRAME_RIGHT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7463 high_x_coord = FRAME_PIXWIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7464 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7465 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7466 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7467 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7468 low_x_coord = FRAME_PIXWIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7469 high_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7470 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7471 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7472 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7473 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7475 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7476 if (position == OVER_TOOLBAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7477 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7478 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7479 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7480 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7481 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7482 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
7483 #endif /* HAVE_TOOLBARS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7484
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7485 /* 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
7486 relative y position even if it is outside the x boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7487 if (x_coord < frm_left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7488 x_coord = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7489 else if (x_coord > frm_right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7490 x_coord = frm_right;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7491
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7492 /* Same in reverse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7493 if (y_coord < frm_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7494 y_coord = frm_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7495 else if (y_coord > frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7496 y_coord = frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7497
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7498 /* Find what window the given coordinates are actually in. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7499 window = f->root_window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7500 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7502 /* If we didn't find a window, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7503 if (!*w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7504 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7505 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7506 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7507 else if (position != OVER_NOTHING)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7508 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7509 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7510 *modeline_closest = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7512 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7513 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7514 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7515 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7516 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7517 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7519 /* Check if the window is a minibuffer but isn't active. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7520 if (MINI_WINDOW_P (*w) && !minibuf_level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7521 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7522 /* Must reset the window value since some callers will ignore
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7523 the return value if it is set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7524 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7525 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7526 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7527
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7528 dla = window_display_lines (*w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7529
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7530 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7531 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7532 int really_over_nothing = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7533 struct display_line *dl = Dynarr_atp (dla, *row);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7534
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7535 if ((int) (dl->ypos - dl->ascent) <= y_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7536 && y_coord <= (int) (dl->ypos + dl->descent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7537 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7538 int check_margin_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7539 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7540 struct rune *rb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7542 if (x_coord < dl->bounds.left_white
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7543 || x_coord >= dl->bounds.right_white)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7544 check_margin_glyphs = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7546 low_y_coord = dl->ypos - dl->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7547 high_y_coord = dl->ypos + dl->descent + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7549 if (position == OVER_BORDER
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7550 || position == OVER_OUTSIDE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7551 || check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7552 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7553 int x_check, left_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7554
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7555 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7556 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7557 x_check = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7558 left_bound = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7559 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7560 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7561 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7562 x_check = high_x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7563 left_bound = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7564 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7566 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7567 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7568 if (x_check <= left_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7569 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7570 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7571 *modeline_closest = Dynarr_atp (db->runes, 0)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7572 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7573 *closest = Dynarr_atp (db->runes, 0)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7574 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7575 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7576 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7577 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7578 *modeline_closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7579 Dynarr_atp (db->runes,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7580 Dynarr_length (db->runes) - 1)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7581 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7582 *closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7583 Dynarr_atp (db->runes,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
7584 Dynarr_length (db->runes) - 1)->bufpos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7585 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7586
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7587 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7588 *modeline_closest += dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7589 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7590 *closest += dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7591 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7592 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7593 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7594 /* #### What should be here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7595 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7596 *modeline_closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7597 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7598 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7599 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7601 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7602 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7603 if (x_coord < dl->bounds.left_in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7604 || x_coord >= dl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7605 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7606 /* If we are over the outside margins then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7607 know the loop over the text block isn't going
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7608 to accomplish anything. So we go ahead and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7609 set what information we can right here and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7610 return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7611 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7612 *obj_y = y_coord - (dl->ypos - dl->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7613 get_position_object (dl, obj1, obj2, x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7614 &low_x_coord, &high_x_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7616 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7617 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7618 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7619 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7620 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7621 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7623 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7624 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7625 int past_end = (*col == Dynarr_length (db->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7626
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7627 if (!past_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7628 rb = Dynarr_atp (db->runes, *col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7630 if (past_end ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7631 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7632 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7633 if (past_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7634 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7635 (*col)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7636 rb = Dynarr_atp (db->runes, *col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7637 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7639 *bufpos = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7640 low_x_coord = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7641 high_x_coord = rb->xpos + rb->width;
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 (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7644 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7645 int elt = *col + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7647 /* Find the first character after the glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7648 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7649 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7650 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7651 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7652 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7653 *modeline_closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7654 (Dynarr_atp (db->runes, elt)->bufpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7655 dl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7656 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7657 *closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7658 (Dynarr_atp (db->runes, elt)->bufpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7659 dl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7660 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7661 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7662
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7663 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7664 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7665
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7666 /* In this case we failed to find a non-glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7667 character so we return the last position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7668 displayed on the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7669 if (elt == Dynarr_length (db->runes))
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 = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7673 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7674 *closest = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7675 really_over_nothing = 1;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
7676 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7677 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7678 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7679 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7680 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7681 *modeline_closest = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7682 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7683 *closest = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7684 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7685
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7686 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7687 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7688 *row = window_displayed_height (*w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7689
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7690 if (position == OVER_NOTHING)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7691 position = OVER_MODELINE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7692
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7693 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7694 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7695 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7696 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7697 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7698 else if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7699 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7700 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7701 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7702 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7703 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7704 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7705 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7706 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7707 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7708
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7709 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7710 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7711 else if (past_end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7712 || (rb->type == RUNE_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7713 && rb->object.chr.ch == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7714 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7715 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7716 /* At this point we may have glyphs in the right
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7717 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7718 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7719 get_position_object (dl, obj1, obj2, x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7720 &low_x_coord, &high_x_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7721 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7722 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7723 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7724 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7725 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7726 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7727 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7728 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7729 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7730 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7731 else if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7732 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7733 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7734 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7735 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7736 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7737 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7738 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7739 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7740 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7742 *obj_x = x_coord - rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7743 *obj_y = y_coord - (dl->ypos - dl->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7745 /* At this point we may have glyphs in the left
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7746 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7747 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7748 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7750 if (position == OVER_NOTHING && !really_over_nothing)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7751 position = OVER_TEXT;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7752
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7753 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7754 }
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 }
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 *row = Dynarr_length (dla) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7761 if (FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7762 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7763 int bot_elt = Dynarr_length (dla) - 1;
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 (bot_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7766 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7767 struct display_line *dl = Dynarr_atp (dla, bot_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7768 int adj_area = y_coord - (dl->ypos + dl->descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7769 Lisp_Object lwin = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7770 int defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7771
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7772 XSETWINDOW (lwin, *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7773 default_face_height_and_width (lwin, 0, &defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7774
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7775 *row += (adj_area / defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7776 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7777 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7779 /* #### This should be checked out some more to determine what
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7780 should really be going on. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7781 if (!MARKERP ((*w)->start[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7782 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7783 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7784 *closest = end_of_last_line (*w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7785 marker_position ((*w)->start[CURRENT_DISP]));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7786 *col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7787 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7788 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7789 #undef UPDATE_CACHE_RETURN
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7791
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7792 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7793 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7794 /* Lisp functions */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7795 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7796 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7797
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7798 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7799 Ensure that all minibuffers are correctly showing the echo area.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7800 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7801 ())
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7802 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7803 Lisp_Object devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7804
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7805 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7806 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7807 struct device *d = XDEVICE (XCAR (devcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7808 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7809
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7810 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7811 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7812 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7813
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
7814 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7815 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7816 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
7817 /*
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7818 * If the frame size has changed, there may be random
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7819 * chud on the screen left from previous messages
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7820 * because redisplay_frame hasn't been called yet.
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7821 * Clear the screen to get rid of the potential mess.
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 213
diff changeset
7822 */
217
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7823 if (f->echo_area_garbaged)
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7824 {
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7825 DEVMETH (d, clear_frame, (f));
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7826 f->echo_area_garbaged = 0;
d44af0c54775 Import from CVS: tag r20-4b7
cvs
parents: 215
diff changeset
7827 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7828 redisplay_window (window, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7829 call_redisplay_end_triggers (XWINDOW (window), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7830 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7831 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7832
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7833 /* We now call the output_end routine for tty frames. We delay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7834 doing so in order to avoid cursor flicker. So much for 100%
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7835 encapsulation. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7836 if (DEVICE_TTY_P (d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7837 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7838 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7839
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7840 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7841 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7842
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7843 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7844 restore_disable_preemption_value (Lisp_Object value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7845 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7846 disable_preemption = XINT (value);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7847 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7848 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7849
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7850 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7851 Clear frame FRAME and output again what is supposed to appear on it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7852 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7853 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7854 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
7855 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7856 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7857 (frame, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7858 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7859 struct frame *f = decode_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7860 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7862 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7863 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7864 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7865 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7866 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7867 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7868
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7869 f->clear = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7870 redisplay_frame (f, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7871
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7872 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7873 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7874
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7875 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7876 Ensure that FRAME's contents are correctly displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7877 This differs from `redraw-frame' in that it only redraws what needs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7878 be updated, as opposed to unconditionally clearing and redrawing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7879 the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7880 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7881 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7882 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
7883 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7884 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7885 (frame, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7886 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7887 struct frame *f = decode_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7888 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7889
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7890 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7891 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7892 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7893 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7894 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7895 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7896
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7897 redisplay_frame (f, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7898
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7899 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7900 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7901
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7902 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7903 Clear device DEVICE and output again what is supposed to appear on it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7904 DEVICE defaults to the selected device if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7905 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7906 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
7907 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7908 */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
7909 (device, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7910 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7911 struct device *d = decode_device (device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7912 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7913 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7914
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7915 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7916 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7917 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7918 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7919 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7920 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7921
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7922 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7923 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7924 XFRAME (XCAR (frmcons))->clear = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7925 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7926 redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7927
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7928 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7929 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7930
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7931 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7932 Ensure that DEVICE's contents are correctly displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7933 This differs from `redraw-device' in that it only redraws what needs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7934 be updated, as opposed to unconditionally clearing and redrawing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7935 the device.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7936 DEVICE defaults to the selected device if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7937 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7938 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
7939 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7940 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7941 (device, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7942 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7943 struct device *d = decode_device (device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7944 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7945
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7946 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7947 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7948 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7949 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7950 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7951 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7953 redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7954
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7955 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7956 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7957
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7958 /* Big lie. Big lie. This will force all modelines to be updated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7959 regardless if the all flag is set or not. It remains in existence
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7960 solely for backwards compatibility. */
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7961 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7962 Force the modeline of the current buffer to be redisplayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7963 With optional non-nil ALL, force redisplay of all modelines.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7964 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7965 (all))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7966 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7967 MARK_MODELINE_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7968 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7969 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7970
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7971 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7972 Force an immediate update of the cursor on FRAME.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7973 FRAME defaults to the selected frame if omitted.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7974 */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
7975 (frame))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7976 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7977 redisplay_redraw_cursor (decode_frame (frame), 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7978 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7979 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7980
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7982 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7983 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7984 /* Lisp-variable change triggers */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7985 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7986 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7988 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7989 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7990 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7991 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7992 /* Nothing to be done? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7993 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7994
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7995 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7996 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7997 Lisp_Object in_object, int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7998 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7999 /* #### clip_changed should really be renamed something like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8000 global_redisplay_change. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8001 MARK_CLIP_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8002 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8003 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8005 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8006 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8007 Lisp_Object locale)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8008 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8009 MARK_CLIP_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8010 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8012 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8013 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8014 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8015 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8016 if (XFRAME (w->frame)->init_finished)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8017 Fforce_cursor_redisplay (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8018 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8020 #ifdef MEMORY_USAGE_STATS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8022
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8023 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8024 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8025 /* memory usage computation */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8026 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8027 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8028
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8029 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8030 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8031 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8032 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8033 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8034
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8035 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8036 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8037 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8038 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8039 int total, i;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8040
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8041 if (!dyn)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8042 return 0;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8043
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8044 total = Dynarr_memory_usage (dyn, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8045 for (i = 0; i < Dynarr_largest (dyn); i++)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8046 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8047
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8048 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8049 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8050
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8051 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8052 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8053 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8054 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8055 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8056 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8057
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8058 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8059 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8060 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8061 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8062 int total, i;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8063
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8064 if (!dyn)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8065 return 0;
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8066
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8067 total = Dynarr_memory_usage (dyn, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8068 for (i = 0; i < Dynarr_largest (dyn); i++)
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8069 {
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8070 struct display_line *dl = &Dynarr_at (dyn, i);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8071 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8072 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8073 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
0
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 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8077 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8078
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8079 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8080 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8081 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8082 {
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8083 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8084 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8085
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8086 #endif /* MEMORY_USAGE_STATS */
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 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8090 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8091 /* initialization */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8092 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8093 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8094
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8095 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8096 init_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8097 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8098 disable_preemption = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8099 preemption_count = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8100 max_preempts = INIT_MAX_PREEMPTS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8102 if (!initialized)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8103 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
8104 cmotion_display_lines = Dynarr_new (display_line);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8105 mode_spec_bufbyte_string = Dynarr_new (Bufbyte);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8106 formatted_string_emchar_dynarr = Dynarr_new (Emchar);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
8107 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8108 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8109 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
8110 internal_cache = Dynarr_new (line_start_cache);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8111 memset (&formatted_string_display_line, 0, sizeof (struct display_line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8112 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8113
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8114 /* window system is nil when in -batch mode */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8115 if (!initialized || noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8116 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8117
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8118 /* If the user wants to use a window system, we shouldn't bother
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8119 initializing the terminal. This is especially important when the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8120 terminal is so dumb that emacs gives up before and doesn't bother
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8121 using the window system.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8122
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8123 If the DISPLAY environment variable is set, try to use X, and die
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8124 with an error message if that doesn't work. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8126 #ifdef HAVE_X_WINDOWS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8127 if (!strcmp (display_use, "x"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8128 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8129 /* Some stuff checks this way early. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8130 Vwindow_system = Qx;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8131 Vinitial_window_system = Qx;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8132 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8133 }
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8134 #endif /* HAVE_X_WINDOWS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8135
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8136 #ifdef HAVE_MS_WINDOWS
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8137 if (!strcmp (display_use, "mswindows"))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8138 {
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8139 /* Some stuff checks this way early. */
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8140 Vwindow_system = Qmswindows;
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8141 Vinitial_window_system = Qmswindows;
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8142 return;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents: 195
diff changeset
8143 }
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8144 #endif /* HAVE_MS_WINDOWS */
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8145
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8146 #ifdef HAVE_TTY
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8147 /* If no window system has been specified, try to use the terminal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8148 if (!isatty (0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8149 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8150 stderr_out ("XEmacs: standard input is not a tty\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8151 exit (1);
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 /* Look at the TERM variable */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8155 if (!getenv ("TERM"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8156 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8157 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8158 exit (1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8159 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8160
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8161 Vinitial_window_system = Qtty;
213
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8162 return;
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8163 #else /* not HAVE_TTY */
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8164 /* No DISPLAY specified, and no TTY support. */
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8165 stderr_out ("XEmacs: Cannot open display.\n\
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8166 Please set the environmental variable DISPLAY to an appropriate value.\n");
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8167 exit (1);
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8168 #endif
78f53ef88e17 Import from CVS: tag r20-4b5
cvs
parents: 211
diff changeset
8169 /* Unreached. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8170 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8172 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8173 syms_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8174 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8175 defsymbol (&Qcursor_in_echo_area, "cursor-in-echo-area");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8176 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8177 defsymbol (&Qpre_redisplay_hook, "pre-redisplay-hook");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8178 defsymbol (&Qpost_redisplay_hook, "post-redisplay-hook");
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8179 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8180 defsymbol (&Qdisplay_warning_buffer, "display-warning-buffer");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8181 defsymbol (&Qbar_cursor, "bar-cursor");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8182 defsymbol (&Qwindow_scroll_functions, "window-scroll-functions");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8183 defsymbol (&Qredisplay_end_trigger_functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8184 "redisplay-end-trigger-functions");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8185
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8186 DEFSUBR (Fredisplay_echo_area);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8187 DEFSUBR (Fredraw_frame);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8188 DEFSUBR (Fredisplay_frame);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8189 DEFSUBR (Fredraw_device);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8190 DEFSUBR (Fredisplay_device);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8191 DEFSUBR (Fredraw_modeline);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8192 DEFSUBR (Fforce_cursor_redisplay);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8193 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8195 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8196 vars_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8197 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8198 #if 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8199 staticpro (&last_arrow_position);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8200 staticpro (&last_arrow_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8201 last_arrow_position = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8202 last_arrow_string = Qnil;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8203 #endif /* 0 */
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 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8206
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8207 /* #### Probably temporary */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8208 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8209 (Temporary) Setting this will impact the performance of the internal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8210 line start cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8211 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8212 cache_adjustment = 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8213
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8214 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8215 Minimum pixel height for clipped bottom display line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8216 A clipped line shorter than this won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8217 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8218 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8219 vertical_clip = 5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8221 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8222 Minimum visible area for clipped glyphs at right boundary.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8223 Clipped glyphs shorter than this won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8224 Only pixmap glyph instances are currently allowed to be clipped.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8225 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8226 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8227 horizontal_clip = 5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8228
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8229 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
8230 String displayed by modeline-format's "%m" specification.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8231 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8232 Vglobal_mode_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8234 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8235 Marker for where to display an arrow on top of the buffer text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8236 This must be the beginning of a line in order to work.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8237 See also `overlay-arrow-string'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8238 */ , redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8239 Voverlay_arrow_position = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8240
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8241 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8242 String to display as an arrow. See also `overlay-arrow-position'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8243 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8244 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8245 Voverlay_arrow_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8247 DEFVAR_INT ("scroll-step", &scroll_step /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8248 *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
8249 If that fails to bring point back on frame, point is centered instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8250 If this is zero, point is always centered after it moves off screen.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8251 */ );
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8252 scroll_step = 0;
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8253
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8254 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8255 *Scroll up to this many lines, to bring point back on screen.
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8256 */ );
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
8257 scroll_conservatively = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8259 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8260 &truncate_partial_width_windows /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8261 *Non-nil means truncate lines in all windows less than full frame wide.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8262 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8263 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8264 truncate_partial_width_windows = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8265
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8266 DEFVAR_BOOL ("visible-bell", &visible_bell /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8267 *Non-nil means try to flash the frame to represent a bell.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8268 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8269 visible_bell = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8270
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8271 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8272 *Non-nil means no need to redraw entire frame after suspending.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8273 A non-nil value is useful if the terminal can automatically preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8274 Emacs's frame display when you reenter Emacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8275 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
8276 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8277 no_redraw_on_reenter = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8278
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8279 DEFVAR_LISP ("window-system", &Vwindow_system /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8280 A symbol naming the window-system under which Emacs is running,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8281 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
8282
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8283 Do not use this variable, except for GNU Emacs compatibility, as it
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8284 gives wrong values in a multi-device environment. Use `console-type'
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8285 instead.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8286 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8287 Vwindow_system = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8289 /* #### Temporary shit until window-system is eliminated. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8290 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8291 DON'T TOUCH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8292 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8293 Vinitial_window_system = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8295 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8296 Non-nil means put cursor in minibuffer, at end of any message there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8297 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8298 cursor_in_echo_area = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8300 /* #### Shouldn't this be generalized as follows:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8301
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8302 if nil, use block cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8303 if a number, use a bar cursor of that width.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8304 Otherwise, use a 1-pixel bar cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8305
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8306 #### Or better yet, this variable should be trashed entirely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8307 (use a Lisp-magic variable to maintain compatibility)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8308 and a specifier `cursor-shape' added, which allows a block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8309 cursor, a bar cursor, a flashing block or bar cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8310 maybe a caret cursor, etc. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8311
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8312 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8313 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
8314 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8315 Vbar_cursor = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8317 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8318 xxDEFVAR_LISP ("pre-redisplay-hook", &Vpre_redisplay_hook /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8319 Function or functions to run before every redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8320 Functions on this hook must be careful to avoid signalling errors!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8321 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8322 Vpre_redisplay_hook = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8323
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8324 xxDEFVAR_LISP ("post-redisplay-hook", &Vpost_redisplay_hook /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8325 Function or functions to run after every redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8326 Functions on this hook must be careful to avoid signalling errors!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8327 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8328 Vpost_redisplay_hook = Qnil;
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8329 #endif /* INHIBIT_REDISPLAY_HOOKS */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8330
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8331 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8332 Bump this to tell the C code to call `display-warning-buffer'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8333 at next redisplay. You should not normally change this; the function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8334 `display-warning' automatically does this at appropriate times.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8335 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8336 display_warning_tick = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8337
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8338 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8339 Non-nil means inhibit display of warning messages.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8340 You should *bind* this, not set it. Any pending warning messages
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8341 will be displayed when the binding no longer applies.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8342 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8343 /* reset to 0 by startup.el after the splash screen has displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8344 This way, the warnings don't obliterate the splash screen. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8345 inhibit_warning_display = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8346
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8347 DEFVAR_LISP ("window-size-change-functions",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8348 &Vwindow_size_change_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8349 Not currently implemented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8350 Functions called before redisplay, if window sizes have changed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8351 The value should be a list of functions that take one argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8352 Just before redisplay, for each frame, if any of its windows have changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8353 size since the last redisplay, or have been split or deleted,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8354 all the functions in the list are called, with the frame as argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8355 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8356 Vwindow_size_change_functions = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8358 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8359 Not currently implemented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8360 Functions to call before redisplaying a window with scrolling.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8361 Each function is called with two arguments, the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8362 and its new display-start position. Note that the value of `window-end'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8363 is not valid when these functions are called.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8364 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8365 Vwindow_scroll_functions = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8367 DEFVAR_LISP ("redisplay-end-trigger-functions",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8368 &Vredisplay_end_trigger_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8369 See `set-window-redisplay-end-trigger'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8370 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8371 Vredisplay_end_trigger_functions = Qnil;
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8372
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8373 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
8374 *Non-nil means column display number starts at 1.
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8375 */ );
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8376 column_number_start_at_one = 1;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8377 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8379 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8380 specifier_vars_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8381 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8382 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8383 *Width of left margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8384 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8385 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8386 Vleft_margin_width = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8387 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8388 set_specifier_caching (Vleft_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8389 slot_offset (struct window, left_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8390 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8391 slot_offset (struct frame, left_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8392 margin_width_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8393
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8394 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8395 *Width of right margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8396 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8397 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8398 Vright_margin_width = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8399 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8400 set_specifier_caching (Vright_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8401 slot_offset (struct window, right_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8402 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8403 slot_offset (struct frame, right_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8404 margin_width_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8406 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8407 *Minimum ascent height of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8408 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8409 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8410 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8411 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8412 set_specifier_caching (Vminimum_line_ascent,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8413 slot_offset (struct window, minimum_line_ascent),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8414 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8415 0, 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 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8418 *Minimum descent height of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8419 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8420 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8421 Vminimum_line_descent = Fmake_specifier (Qnatnum);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8422 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8423 set_specifier_caching (Vminimum_line_descent,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8424 slot_offset (struct window, minimum_line_descent),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8425 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8426 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8427
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8428 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8429 *Non-nil means use the left outside margin as extra whitespace when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8430 displaying 'whitespace or 'inside-margin glyphs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8431 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8432 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8433 Vuse_left_overflow = Fmake_specifier (Qboolean);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8434 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8435 set_specifier_caching (Vuse_left_overflow,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8436 slot_offset (struct window, use_left_overflow),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8437 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8438 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8439
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8440 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8441 *Non-nil means use the right outside margin as extra whitespace when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8442 displaying 'whitespace or 'inside-margin glyphs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8443 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8444 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8445 Vuse_right_overflow = Fmake_specifier (Qboolean);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8446 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8447 set_specifier_caching (Vuse_right_overflow,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8448 slot_offset (struct window, use_right_overflow),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8449 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8450 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8451
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8452 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8453 *Non-nil means the text cursor is visible (this is usually the case).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8454 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8455 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8456 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8457 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8458 set_specifier_caching (Vtext_cursor_visible_p,
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 179
diff changeset
8459 slot_offset (struct window, text_cursor_visible_p),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8460 text_cursor_visible_p_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8461 0, 0);
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8462
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8463 }