annotate src/redisplay.c @ 116:9f59509498e1 r20-1b10

Import from CVS: tag r20-1b10
author cvs
date Mon, 13 Aug 2007 09:23:06 +0200
parents fe104dbd9147
children cca96a509cfe
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"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
60 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
61 #include "mule-coding.h"
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
62 #endif
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
63
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 /* Note: We have to be careful throughout this code to properly handle
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 and differentiate between Bufbytes and Emchars.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 Since strings are generally composed of Bufbytes, I've taken the tack
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 that any contiguous set of Bufbytes is called a "string", while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 any contiguous set of Emchars is called an "array". */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 /* Return value to indicate a failure by an add_*_rune routine to add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 a rune, but no propagation information needs to be returned. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 #define ADD_FAILED (prop_block_dynarr *) 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 #define BEGIN_GLYPHS 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 #define END_GLYPHS 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 #define LEFT_GLYPHS 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 #define RIGHT_GLYPHS 3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 /* Set the vertical clip to 0 if we are currently updating the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 start cache. Otherwise for buffers of line height 1 it may fail to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 be able to work properly because regenerate_window will not layout
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 a single line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 #define VERTICAL_CLIP(w, display) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 (updating_line_start_cache \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 ? 0 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 : ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 ? INT_MAX \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 : vertical_clip))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 /* The following structures are completely private to redisplay.c so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 we put them here instead of in a header file, for modularity. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 /* NOTE: Bytinds not Bufpos's in this structure. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 typedef struct position_redisplay_data_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 /* This information is normally filled in by the create_*_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 routines and is used by the add_*_rune routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 Emchar ch; /* Character that is to be added. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 used to communicate this information to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 add_emchar_rune(). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 Lisp_Object last_charset; /* The charset of the previous character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 Used to optimize some lookups -- we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 only have to do some things when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 the charset changes. */
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
111 face_index last_findex; /* The face index of the previous character.
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
112 Needed to ensure the validity of the
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
113 last_charset optimization. */
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
114
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 int last_char_width; /* The width of the previous character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 int font_is_bogus; /* If true, it means we couldn't instantiate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 the font for this charset, so we substitute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 ~'s from the ASCII charset. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 Bytind bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 Bytind bi_endpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 int pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 int max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 int blank_width; /* Width of the blank that is to be added.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 This is used to communicate this information
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 to add_blank_rune().
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 This is also used rather cheesily to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 communicate the width of the eol-cursor-size
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 blank that exists at the end of the line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 add_emchar_rune() is called cheesily with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 the non-printing char '\n', which is stuck
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 in the output routines with its width being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 BLANK_WIDTH. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 Bytind bi_cursor_bufpos;/* This stores the buffer position of the cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 unsigned int cursor_type :3;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 int cursor_x; /* rune block cursor is at */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 int start_col; /* Number of character columns (each column has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 a width of the default char width) that still
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 need to be skipped. This is used for horizontal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 scrolling, where a certain number of columns
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 (those off the left side of the screen) need
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 to be skipped before anything is displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 Bytind bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 /* Information about the face the text should be displayed in and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 any begin-glyphs and end-glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 struct extent_fragment *ef;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 face_index findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 /* 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
151 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
152 line ascent and descent values end up being, based just on font
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 information. In the first case we can immediately update the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 values, thus their inclusion here. In the last case we cannot
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 determine the actual contribution to the line height until we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 have finished laying out all text on the line. Thus we propagate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 the max height of such pixmaps and do a final calculation after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 all text has been added to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 int new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 int new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 int max_pixmap_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 Lisp_Object result_str; /* String where we put the result of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 generating a formatted string in the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 int is_modeline; /* Non-zero if we're generating the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 Charcount modeline_charpos; /* Number of chars used in result_str so far;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 corresponds to bytepos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 Bytecount bytepos; /* Number of bytes used in result_str so far.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 We don't actually copy the bytes into result_str
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 until the end because we don't know how big the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 string is going to be until then. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 } pos_data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 enum prop_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 PROP_STRING,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 PROP_CHAR,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 PROP_MINIBUF_PROMPT,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 PROP_BLANK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 /* Data that should be propagated to the next line. Either a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 Emchar or a string of Bufbyte's.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 The actual data that is propagated ends up as a Dynarr of these
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 blocks.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 #### It's unclean that both Emchars and Bufbytes are here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 struct prop_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 enum prop_type type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 union data
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 struct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 Bufbyte *str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 Bytecount len; /* length of the string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 } p_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 struct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 Emchar ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 Bytind bi_cursor_bufpos; /* NOTE: is in Bytinds */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 unsigned int cursor_type :3;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 } p_char;
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 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 face_index findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 } p_blank;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 } data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 typedef struct prop_block_dynarr_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 Dynarr_declare (struct prop_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 } prop_block_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 * Prototypes for all functions defined in redisplay.c.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 struct display_block *get_display_block_from_line (struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 enum display_type type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 layout_bounds calculate_display_line_boundaries (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 int modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 static Bufpos generate_display_line (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 int bounds, Bufpos start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 int start_col, prop_block_dynarr **prop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 static void generate_modeline (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 static int ensure_modeline_generated (struct window *w, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 static void generate_formatted_string_db (Lisp_Object format_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 Lisp_Object result_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 face_index findex, int min_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 int max_pixpos, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 Charcount pos, Charcount min_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 Charcount max_pos, Lisp_Object elt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 int depth, int max_pixsize,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 face_index findex, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 static prop_block_dynarr *add_emchar_rune (pos_data *data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 static prop_block_dynarr *add_bufbyte_string_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 Bufbyte *c_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 Bytecount c_length,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 int no_prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 static prop_block_dynarr *add_blank_rune (pos_data *data, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 int char_tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 static prop_block_dynarr *add_octal_runes (pos_data *data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 static prop_block_dynarr *add_control_char_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 struct buffer *b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 static prop_block_dynarr *add_disp_table_entry_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 Lisp_Object entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 static prop_block_dynarr *add_propagation_runes (prop_block_dynarr **prop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 pos_data *data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 static prop_block_dynarr *add_glyph_rune (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 struct glyph_block *gb,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 int pos_type, int allow_cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 struct glyph_cachel *cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 static prop_block_dynarr *add_glyph_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 int pos_type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 /* NOTE: Bytinds not Bufpos's here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 static Bytind create_text_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 Bytind bi_start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 prop_block_dynarr **prop, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 static int create_overlay_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 static void create_left_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 int overlay_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 static void create_right_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 static void regenerate_window (struct window *w, Bufpos start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 Bufpos point, int type);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
283 static void regenerate_window_point_center (struct window *w, Bufpos point,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
284 int type);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 int window_half_pixpos (struct window *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 int line_at_center (struct window *w, int type, Bufpos start, Bufpos point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 Bufpos point_at_center (struct window *w, int type, Bufpos start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 Bufpos point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 static void redisplay_window (Lisp_Object window, int skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 static void redisplay_windows (Lisp_Object window, int skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 static int redisplay_frame (struct frame *f, int preemption_check);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 void redisplay (void);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 static void decode_mode_spec (struct window *w, Emchar spec, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 static void free_display_line (struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 void free_display_structs (struct window_mirror *mir);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 static int point_visible (struct window *w, Bufpos point, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 static void update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 Bufpos point, int no_regen);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 static Bufpos line_start_cache_start (struct window *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 static Bufpos line_start_cache_end (struct window *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 /* This used to be 10 but 30 seems to give much better performance. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 #define INIT_MAX_PREEMPTS 30
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 static int max_preempts;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 #define REDISPLAY_PREEMPTION_CHECK \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 preempted = 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 if (!disable_preemption && \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro))) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 if (!INTERACTIVE || detect_input_pending ()) { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 preempted = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 * Redisplay global variables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 /* We need a third set of display structures for the cursor motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 routines. We used to just give each window a third set. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 we always fully regenerate the structures when needed so there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 isn't any reason we need more than a single set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 display_line_dynarr *cmotion_display_lines;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 /* Used by generate_formatted_string. Global because they get used so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 much that the dynamic allocation time adds up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 emchar_dynarr *formatted_string_emchar_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 struct display_line formatted_string_display_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 /* 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
331 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
332 this way rather than adding them as we generate the string because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 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
334 (to avoid having to resize the string multiple times), and we don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 want to go around adding extents to a string when the extents might
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 stretch off the end of the string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 extent_dynarr *formatted_string_extent_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 bytecount_dynarr *formatted_string_extent_start_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 bytecount_dynarr *formatted_string_extent_end_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 /* #### probably temporary */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 int cache_adjustment;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 /* This holds a string representing the text corresponding to a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 modeline % spec. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 static bufbyte_dynarr *mode_spec_bufbyte_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 int in_display; /* 1 if in redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 int disable_preemption; /* Used for debugging redisplay and for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 force-redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 /* We only allow max_preempts preemptions before we force a redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 static int preemption_count;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 /* Minimum pixel height of clipped bottom display line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 int vertical_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 /* Minimum visible pixel width of clipped glyphs at right margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 int horizontal_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363 /* Set if currently inside update_line_start_cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 int updating_line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 /* Nonzero means reading single-character input with prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 so put cursor on minibuffer after the prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 int cursor_in_echo_area;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 Lisp_Object Qcursor_in_echo_area;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 /* Nonzero means truncate lines in all windows less wide than the frame */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 int truncate_partial_width_windows;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 /* non-nil if a buffer has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 int buffers_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 int buffers_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 /* non-nil if hscroll has changed somewhere or a buffer has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 narrowed or widened */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 int clip_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 int clip_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 /* non-nil if any extent has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 int extents_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 int extents_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 /* non-nil if any face has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 int faces_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 /* Nonzero means some frames have been marked as garbaged */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 int frame_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 /* This variable is 1 if the icon has to be updated.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 It is set to 1 when `frame-icon-glyph' changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 int icon_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 int icon_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 /* This variable is 1 if the menubar widget has to be updated.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 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
400 has been indapted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 /* indapted???? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 int menubar_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 int menubar_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 /* true iff we should redraw the modelines on the next redisplay */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 int modeline_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 int modeline_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 /* non-nil if point has changed in some buffer since the last time
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 int point_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 int point_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 /* non-nil if some frame has changed its size */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 int size_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 /* non-nil if some device has signaled that it wants to change size */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 int asynch_device_change_pending;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 /* non-nil if any toolbar has changed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 int toolbar_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 int toolbar_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 /* non-nil if any window has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 int windows_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
427 /* 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
428 time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 int windows_structure_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 /* If non-nil, use vertical bar cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 Lisp_Object Vbar_cursor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 Lisp_Object Qbar_cursor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 int visible_bell; /* If true and the terminal will support it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 then the frame will flash instead of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 beeping when an error occurs */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 /* Nonzero means no need to redraw the entire frame on resuming
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 a suspended Emacs. This is useful on terminals with multiple pages,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 where one page is used for Emacs and another for all else. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 int no_redraw_on_reenter;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 under which emacs is running
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 ('x is the only current possibility) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 Lisp_Object Vinitial_window_system;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 Lisp_Object Vglobal_mode_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 /* The number of lines to try scrolling a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 window by when point leaves the window; if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 it is <=0 then point is centered in the window */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 int scroll_step;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 /* Marker for where to display an arrow on top of the buffer text. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 Lisp_Object Voverlay_arrow_position;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 /* String to display for the arrow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 Lisp_Object Voverlay_arrow_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 Lisp_Object Vwindow_size_change_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 #define INHIBIT_REDISPLAY_HOOKS /* #### Until we've thought about
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 this more. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 /* #### Chuck says: I think this needs more thought.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 Think about this for 19.14. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 int last_display_warning_tick, display_warning_tick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 Lisp_Object Qdisplay_warning_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 int inhibit_warning_display;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 Lisp_Object Vleft_margin_width, Vright_margin_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 Lisp_Object Vtext_cursor_visible_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
484 int column_number_start_at_one;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 /* low-level interfaces onto device routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 redisplay_text_width_emchar_string (struct window *w, int findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 Emchar *str, Charcount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 unsigned char charsets[NUM_LEADING_BYTES];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 find_charsets_in_emchar_string (charsets, str, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 charsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 text_width, (WINDOW_FACE_CACHEL (w, findex),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 str, len));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 static emchar_dynarr *rtw_emchar_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 redisplay_text_width_string (struct window *w, int findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 Bytecount offset, Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 if (!rtw_emchar_dynarr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 rtw_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 Dynarr_reset (rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 fixup_internal_substring (nonreloc, reloc, offset, &len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 if (STRINGP (reloc))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
521 nonreloc = XSTRING_DATA (reloc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 return redisplay_text_width_emchar_string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 (w, findex, Dynarr_atp (rtw_emchar_dynarr, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 Dynarr_length (rtw_emchar_dynarr));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 Bytecount offset, Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 unsigned char charsets[NUM_LEADING_BYTES];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 Lisp_Object frame = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 struct face_cachel cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 if (!rtw_emchar_dynarr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 rtw_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 Dynarr_reset (rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 fixup_internal_substring (nonreloc, reloc, offset, &len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 if (STRINGP (reloc))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
543 nonreloc = XSTRING_DATA (reloc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 find_charsets_in_bufbyte_string (charsets, nonreloc, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 reset_face_cachel (&cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 cachel.face = face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 XSETFRAME (frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 ensure_face_cachel_complete (&cachel, frame, charsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 text_width, (&cachel, Dynarr_atp (rtw_emchar_dynarr, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 Dynarr_length (rtw_emchar_dynarr)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 /* Return the display block from DL of the given TYPE. A display line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 can have only one display block of each possible type. If DL does
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 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
558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 struct display_block *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 get_display_block_from_line (struct display_line *dl, enum display_type type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 struct display_block db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 /* 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
566 if so, return it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 if (Dynarr_at (dl->display_blocks, elt).type == type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 return (Dynarr_atp (dl->display_blocks, elt));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 /* There isn't an active block of the desired type, but there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 might still be allocated blocks we need to reuse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 if (elt < Dynarr_largest (dl->display_blocks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 /* 'add' the block to the list */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 Dynarr_increment (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 /* initialize and return */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 dbp->type = type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 return dbp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 /* This line doesn't have any display blocks, so initialize the display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 bock array. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 dl->display_blocks = Dynarr_new (struct display_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 /* 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
597 one and add it to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 memset (&db, 0, sizeof (struct display_block));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 db.type = type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 db.runes = Dynarr_new (struct rune);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 Dynarr_add (dl->display_blocks, db);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 /* Return the newly added display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 elt = Dynarr_length (dl->display_blocks) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 return Dynarr_atp (dl->display_blocks, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 tab_char_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 int char_tab_width = XINT (b->tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 return char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 space_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 /* While tabs are traditional composed of spaces, for variable-width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 fonts the space character tends to give too narrow a value. So
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 we use 'n' instead. Except that we don't. We use the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 character width for the default face. If this is actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 defined by the font then it is probably the best thing to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 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
629 already calculated its width. Thus we can avoid a call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 XTextWidth on X frames by just querying the default width. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 return XFONT_INSTANCE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->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 tab_pix_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 return (space_width (w) * tab_char_width (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 /* Given a pixel position in a window, return the pixel location of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 the next tabstop. Tabs are calculated from the left window edge in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 terms of spaces displayed in the default face. Formerly the space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 width was determined using the currently active face. That method
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 leads to tabstops which do not line up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 int n_pos = left_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 int pix_tab_width = tab_pix_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 /* Adjust n_pos for any hscrolling which has happened. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 if (w->hscroll > 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 n_pos -= space_width (w) * (w->hscroll - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 while (n_pos <= start_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 n_pos += pix_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 return n_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 /* For the given window, calculate the outside and margin boundaries for a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 display line. The whitespace boundaries must be calculated by the text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 layout routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 layout_bounds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 calculate_display_line_boundaries (struct window *w, int modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 layout_bounds bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 /* Set the outermost boundaries which are the boundaries of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 window itself minus the gutters (and minus the scrollbars if this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 is for the modeline). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 if (!modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 bounds.left_out = WINDOW_TEXT_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 bounds.right_out = WINDOW_TEXT_RIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 bounds.left_out = WINDOW_MODELINE_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 /* The inner boundaries mark where the glyph margins are located. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 bounds.left_in = bounds.left_out + window_left_margin_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 bounds.right_in = bounds.right_out - window_right_margin_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 /* We cannot fully calculate the whitespace boundaries as they
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 depend on the contents of the line being displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 bounds.left_white = bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 bounds.right_white = bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 return bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 /* Given a display line and a starting position, ensure that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 contents of the display line accurately represent the visual
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 representation of the buffer contents starting from the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 position when displayed in the given window. The display line ends
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 when the contents of the line reach the right boundary of the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 generate_display_line (struct window *w, struct display_line *dl, int bounds,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 Bufpos start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 prop_block_dynarr **prop, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 Bufpos ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 int overlay_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 /* If our caller hasn't already set the boundaries, then do so now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 if (!bounds)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 dl->bounds = calculate_display_line_boundaries (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 /* Reset what this line is using. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 Dynarr_reset (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 if (dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 Dynarr_free (dl->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 dl->left_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 if (dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728 Dynarr_free (dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 dl->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 /* We aren't generating a modeline at the moment. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 dl->modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 /* Create a display block for the text region of the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 /* #### urk urk urk!!! Chuck fix this shit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 Bytind hacked_up_bytind =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 create_text_block (w, dl, bufpos_to_bytind (b, start_pos),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740 start_col, prop, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 if (hacked_up_bytind > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 ret_bufpos = BUF_ZV (b) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 ret_bufpos = bytind_to_bufpos (b, hacked_up_bytind);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 dl->bufpos = start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 if (dl->end_bufpos < dl->bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 dl->end_bufpos = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 if (MARKERP (Voverlay_arrow_position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752 && start_pos == marker_position (Voverlay_arrow_position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 && (STRINGP (Voverlay_arrow_string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 || GLYPHP (Voverlay_arrow_string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756 overlay_width = create_overlay_glyph_block (w, dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 }
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 overlay_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 /* If there are left glyphs associated with any character in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 text block, then create a display block to handle them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 create_left_glyph_block (w, dl, overlay_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 /* If there are right glyphs associated with any character in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 text block, then create a display block to handle them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 create_right_glyph_block (w, dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 /* In the future additional types of display blocks may be generated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 w->last_redisplay_pos = ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 return ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 /* Adds an hscroll glyph to a display block. If this is called, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 the block had better be empty.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 Yes, there are multiple places where this function is called but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 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
784 with bi_start_col_enabled a little differently depending on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 object being worked with. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 add_hscroll_rune (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 Bytind bi_old_bufpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796 if (data->cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 && data->bi_cursor_bufpos >= data->bi_start_col_enabled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 && data->bi_cursor_bufpos <= data->bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 data->bi_cursor_bufpos = data->bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 data->bi_endpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 data->bi_bufpos = data->bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 gb.glyph = Vhscroll_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 GLYPH_CACHEL (XWINDOW (data->window),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 HSCROLL_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 data->bi_endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 data->bi_bufpos = bi_old_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 data->bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 /* Adds a character rune to a display block. If there is not enough
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 room to fit the rune on the display block (as determined by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 MAX_PIXPOS) then it adds nothing and returns ADD_FAILED. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 add_emchar_rune (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 struct rune rb, *crb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 int width, local;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 return add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 if (data->ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 data->font_is_bogus = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 /* Cheesy end-of-line pseudo-character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 Lisp_Object charset = CHAR_CHARSET (data->ch);
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
857 if (!EQ (charset, data->last_charset) ||
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
858 data->findex != data->last_findex)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 /* OK, we need to do things the hard way. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 Lisp_Object font_instance =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 ensure_face_cachel_contains_charset (cachel, data->window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 charset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 struct Lisp_Font_Instance *fi;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 if (EQ (font_instance, Vthe_null_font_instance))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 data->font_is_bogus = 1;
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 data->font_is_bogus = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 fi = XFONT_INSTANCE (font_instance);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 if (!fi->proportional_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 /* sweetness and light. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 data->last_char_width = fi->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 data->last_char_width = -1;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
882 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 data->new_descent = max (data->new_descent, (int) fi->descent);
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
884 data->last_charset = charset;
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
885 data->last_findex = data->findex;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 width = data->last_char_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 if (width < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 /* bummer. Proportional fonts. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 width = redisplay_text_width_emchar_string (XWINDOW (data->window),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 data->findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 &data->ch, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 local = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 crb = &rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 local = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 crb->findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 crb->xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 crb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 if (data->bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 struct buffer *buf = XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 crb->bufpos = bytind_to_bufpos (buf, data->bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 else if (data->is_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 crb->bufpos = data->modeline_charpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 /* fuckme if this shouldn't be an abort. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 /* abort (); fuckme harder, this abort gets tripped quite often,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 in propagation and whatnot. #### fixme */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 crb->bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 crb->type = RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 crb->endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 crb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 crb->cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 crb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 else if (data->cursor_type == IGNORE_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 crb->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 crb->cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 if (local)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 Dynarr_add (data->db->runes, *crb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 Dynarr_increment (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 data->pixpos += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 /* Given a string C_STRING of length C_LENGTH, call add_emchar_rune
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 for each character in the string. Propagate any left-over data
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 unless NO_PROP is non-zero. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 add_bufbyte_string_runes (pos_data *data, Bufbyte *c_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 Bytecount c_length, int no_prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 Bufbyte *pos, *end = c_string + c_length;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 /* #### This function is too simplistic. It needs to do the same
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 sort of character interpretation (display-table lookup,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 ctl-arrow checking), etc. that create_text_block() does.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 The functionality to do this in that routine needs to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 modularized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 for (pos = c_string; pos < end;)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 data->ch = charptr_emchar (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 if (no_prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 Bytecount len = end - pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 prop = Dynarr_new (struct prop_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 pb.type = PROP_STRING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 pb.data.p_string.str =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 (Bufbyte *) xmalloc (sizeof (Bufbyte) * len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 pb.data.p_string.len = len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 INC_CHARPTR (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 assert (pos <= end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 /* Add a single rune of the specified width. The area covered by this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 rune will be displayed in the foreground color of the associated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 /* 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
1024 been to add it as a tab. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 /* assert (w != NULL) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 /* If we have still not fully scrolled horizontally, subtract
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 the width of this tab and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 if (char_tab_width < data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 data->start_col -= char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 else if (char_tab_width == data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 data->blank_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041 int spcwid = space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 if (spcwid >= data->blank_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 data->blank_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 data->blank_width -= spcwid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 data->start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 /* Could be caused by the handling of the hscroll rune. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 if (retval != NULL || !data->blank_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 /* Blank runes are always calculated to fit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 assert (data->pixpos + data->blank_width <= data->max_pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 rb.findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 rb.xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 rb.width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 if (data->bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 struct buffer *buf = XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 rb.bufpos = bytind_to_bufpos (buf, data->bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 /* #### and this is really correct too? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 rb.bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 rb.type = RUNE_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 Dynarr_add (data->db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 data->pixpos += data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 /* Add runes representing a character in octal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 if (add_failed || (add_failed = add_emchar_rune (data))) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 struct prop_block pb; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 if (!prop) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 prop = Dynarr_new (struct prop_block); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 pb.type = PROP_CHAR; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 pb.data.p_char.ch = data->ch; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 pb.data.p_char.cursor_type = data->cursor_type; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 Dynarr_add (prop, pb); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 add_octal_runes (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 prop_block_dynarr *prop, *add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 Emchar orig_char = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 unsigned int orig_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 /* Initialize */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 add_failed = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 if (!data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 add_failed = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142 gb.glyph = Voctal_escape_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 add_failed =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 /* We only propagate information if the glyph was partially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 added. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 return add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 if (data->ch >= 0x100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 /* If the character is an extended Mule character, it could have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 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
1160 octal number. This is not that pretty, but whatever. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 data->ch = (7 & (orig_char >> 18)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 data->ch = (7 & (orig_char >> 15)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 data->ch = (7 & (orig_char >> 12)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 ADD_NEXT_OCTAL_RUNE_CHAR;
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->ch = (7 & (orig_char >> 9)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 data->ch = (7 & (orig_char >> 6)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 data->ch = (7 & (orig_char >> 3)) + '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) + '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->cursor_type = orig_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 #undef 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 /* Add runes representing a control character to a display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 add_control_char_runes (pos_data *data, struct buffer *b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 if (!NILP (b->ctl_arrow))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197 Emchar orig_char = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 /* Initialize */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 if (!data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 if (retval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 gb.glyph = Vcontrol_arrow_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 /* We only propagate information if the glyph was partially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 added. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 if (orig_char == 0177)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 data->ch = '?';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 data->ch = orig_char ^ 0100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 if (add_emchar_rune (data))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 if (!prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 prop = Dynarr_new (struct prop_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 pb.type = PROP_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 pb.data.p_char.ch = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 pb.data.p_char.cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 return add_octal_runes (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 /* Given a display table entry, call the appropriate functions to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 display each element of the entry. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 if (VECTORP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 struct Lisp_Vector *de = XVECTOR (entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 long len = vector_length (de);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 for (elt = 0; elt < len; elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 if (NILP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277 else if (STRINGP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279 prop =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280 add_bufbyte_string_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 (data,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1282 XSTRING_DATA (de->contents[elt]),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1283 XSTRING_LENGTH (de->contents[elt]),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 else if (GLYPHP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 data->start_col--;
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 (!data->start_col && data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 prop = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299 gb.glyph = de->contents[elt];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 else if (CHAR_OR_CHAR_INTP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306 data->ch = XCHAR_OR_CHAR_INT (de->contents[elt]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 /* Else blow it off because someone added a bad entry and we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 don't have any safe way of signaling an error. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 /* #### Still need to add any remaining elements to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313 propagation information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 else if (STRINGP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320 prop = add_bufbyte_string_runes (data,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1321 XSTRING_DATA (entry),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
1322 XSTRING_LENGTH (entry),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 0);
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 if (GLYPHP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 if (!data->start_col && data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 prop = add_hscroll_rune (data);
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338 gb.glyph = entry;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 else if (CHAR_OR_CHAR_INTP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345 data->ch = XCHAR_OR_CHAR_INT (entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 /* 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
1350 have any safe way of signaling an error. Hey, this comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 sounds familiar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 /* Add runes which were propagated from the previous line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 /* #### Remember to handle start_col parameter of data when the rest of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 this is finished. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 /* #### Chuck -- I've redone this function a bit. It looked like the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 case of not all the propagation blocks being added was not handled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 well. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 /* #### Chuck -- I also think the double indirection of PROP is kind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 of bogus. A cleaner solution is just to check for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 Dynarr_length (prop) > 0. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 /* #### This function also doesn't even pay attention to ADD_FAILED!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 This is seriously fucked! Seven ####'s in 130 lines -- is that a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 record? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 prop_block_dynarr *add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 for (elt = 0; elt < Dynarr_length (*prop); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378 struct prop_block *pb = Dynarr_atp (*prop, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 switch (pb->type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 case PROP_CHAR:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 data->ch = pb->data.p_char.ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 data->bi_cursor_bufpos = pb->data.p_char.bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 data->cursor_type = pb->data.p_char.cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 add_failed = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391 case PROP_STRING:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 if (pb->data.p_string.str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 xfree (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 /* #### bogus bogus -- this doesn't do anything!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395 Should probably call add_bufbyte_string_runes(),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 once that function is fixed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 case PROP_MINIBUF_PROMPT:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 Bytind bi_old_bufpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 data->findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 data->bi_bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 while (pb->data.p_string.len > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409 data->ch = charptr_emchar (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 add_failed = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 data->bi_bufpos = bi_old_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 /* Complicated equivalent of ptr++, len-- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 Bufbyte *oldpos = pb->data.p_string.str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422 INC_CHARPTR (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 /* ##### FIXME FIXME FIXME -- Upon successful return from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429 this function, data->bi_bufpos is automatically incremented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 However, we don't want that to happen if we were adding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 the minibuffer prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 struct buffer *buf =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 /* #### Chuck fix this shit or I'm gonna scream! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 if (bi_old_bufpos > BI_BUF_BEGV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 data->bi_bufpos = prev_bytind (buf, bi_old_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 /* #### is this correct? Does anyone know?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 Does anyone care? Is this a cheesy hack or what? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 data->bi_bufpos = BI_BUF_BEGV (buf) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 case PROP_BLANK:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 /* #### I think it's unnecessary and misleading to preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 the blank_width, as it implies that the value carries
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 over from one rune to the next, which is wrong. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 int old_width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 data->findex = pb->data.p_blank.findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 data->blank_width = pb->data.p_blank.width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 data->bi_cursor_bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 if (data->pixpos + data->blank_width > data->max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 data->blank_width = data->max_pixpos - data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 /* We pass a bogus value of char_tab_width. It shouldn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 matter because unless something is really screwed up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 this call won't cause that arg to be used. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 /* This can happen in the case where we have a tab which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 is wider than the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 if (data->blank_width != pb->data.p_blank.width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 pb->data.p_blank.width -= data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 add_failed = ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 data->blank_width = old_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 default:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 oops_no_more_space:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 if (elt < Dynarr_length (*prop))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 Dynarr_delete_many (*prop, 0, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493 return *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 return NULL;
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 /* Add 'text layout glyphs at position POS_TYPE that are contained to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503 the display block, but add all other types to the appropriate list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 of the display line. They will be added later by different
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 int allow_cursor, struct glyph_cachel *cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 /* A nil extent indicates a special glyph (ex. truncator). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 if (NILP (gb->extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515 || (pos_type == BEGIN_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 || (pos_type == END_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 int xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 int ascent, descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 Lisp_Object baseline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 if (cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 width = cachel->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 width = glyph_width (gb->glyph, Qnil, data->findex, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 if (!width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 int glyph_char_width = width / space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 /* If we still have not fully scrolled horizontally after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 taking into account the width of the glyph, subtract its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 width and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 if (glyph_char_width < data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545 data->start_col -= glyph_char_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548 else if (glyph_char_width == data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 xoffset = space_width (w) * data->start_col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 width -= xoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 /* #### Can this happen? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 if (width < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 data->start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 /* Could be caused by the handling of the hscroll rune. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 if (retval != NULL || !width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570 if (data->pixpos + width > data->max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 /* If this is the first object we are attempting to add to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 the line then we ignore the horizontal_clip threshold.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574 Otherwise we will loop until the bottom of the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575 continually failing to add this glyph because it is wider
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576 than the window. We could alternatively just completely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577 ignore the glyph and proceed from there but I think that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 this is a better solution. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579 if (Dynarr_length (data->db->runes)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 && data->max_pixpos - data->pixpos < horizontal_clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583 width = data->max_pixpos - data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 }
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 (cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588 ascent = cachel->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 descent = cachel->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 ascent = glyph_ascent (gb->glyph, Qnil, data->findex, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 descent = glyph_descent (gb->glyph, Qnil, data->findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598 baseline = glyph_baseline (gb->glyph, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 if (glyph_contrib_p (gb->glyph, data->window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 /* A pixmap that has not had a baseline explicitly set. Its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 contribution will be determined later. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 if (NILP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607 data->max_pixmap_height = max (data->max_pixmap_height, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 /* A string so determine contribution normally. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 else if (EQ (baseline, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 data->new_ascent = max (data->new_ascent, ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 data->new_descent = max (data->new_descent, descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 /* A pixmap with an explicitly set baseline. We determine the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 contribution here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 else if (INTP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 pix_ascent = height * XINT (baseline) / 100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 pix_descent = height - pix_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 data->new_ascent = max (data->new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 data->new_descent = max (data->new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 /* Otherwise something is screwed up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 face = glyph_face (gb->glyph, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1637 if (NILP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638 rb.findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 rb.findex = get_builtin_face_cache_index (w, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 rb.xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 rb.width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 rb.bufpos = 0; /* glyphs are never "at" anywhere */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 if (data->bi_endpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647 /* #### is this necessary at all? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 rb.endpos = bytind_to_bufpos (buf, data->bi_endpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1651 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653 rb.type = RUNE_DGLYPH;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 /* #### Ben sez: this is way bogus if the glyph is a string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1655 You should not make the output routines have to cope with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1656 this. The string could contain Mule characters, or non-
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1657 printable characters, or characters to be passed through
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 the display table, or non-character objects (when this gets
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 implemented), etc. Instead, this routine here should parse
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660 the string into a series of runes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 rb.object.dglyph.glyph = gb->glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662 rb.object.dglyph.extent = gb->extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 rb.object.dglyph.xoffset = xoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 if (allow_cursor)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 rb.bufpos = bytind_to_bufpos (buf, data->bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 else if (data->cursor_type == IGNORE_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 rb.cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 else if (data->cursor_type == NO_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 rb.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1693 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 Dynarr_add (data->db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 data->pixpos += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 if (!NILP (glyph_face (gb->glyph, data->window)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 gb->findex =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1709 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 gb->findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712 if (pos_type == BEGIN_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 if (!data->dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 data->dl->left_glyphs = Dynarr_new (struct glyph_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 Dynarr_add (data->dl->left_glyphs, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719 else if (pos_type == END_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 if (!data->dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 data->dl->right_glyphs = Dynarr_new (struct glyph_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723 Dynarr_add (data->dl->right_glyphs, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727 abort (); /* there are no unknown types */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 return NULL; /* shut up compiler */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 /* Add all glyphs at position POS_TYPE that are contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734 data. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 add_glyph_runes (pos_data *data, int pos_type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 why didn't you just modify add_glyph_rune in the first place? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 ? data->ef->begin_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744 : data->ef->end_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 /* #### Add some propagation information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 Dynarr_reset (glyph_arr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 /* Given a position for a buffer in a window, ensure that the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765 display line DL accurately represents the text on a line starting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766 at the given position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768 NOTE NOTE NOTE NOTE: This function works with and returns Bytinds.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769 You must do appropriate conversion. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771 static Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772 create_text_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 Bytind bi_start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 prop_block_dynarr **prop, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 pos_data data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 struct Lisp_Vector *dt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 /* Don't display anything in the minibuffer if this window is not on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784 a selected frame. We consider all other windows to be active
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 minibuffers as it simplifies the coding. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 int active_minibuffer = (!MINI_WINDOW_P (w) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 (f == device_selected_frame (d)) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 is_surrogate_for_selected_frame (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 int truncate_win = window_truncation_on (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 int end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 /* If the buffer's value of selective_display is an integer then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1794 only lines that start with less than selective_display columns of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 space will be displayed. If selective_display is t then all text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 after a ^M is invisible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 int selective = (INTP (b->selective_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 ? XINT (b->selective_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 : ((!NILP (b->selective_display) ? -1 : 0)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 /* The variable ctl-arrow allows the user to specify what characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 can actually be displayed and which octal should be used for.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 #### This variable should probably have some rethought done to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 #### It would also be really nice if you could specify that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 the characters come out in hex instead of in octal. Mule
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 does that by adding a ctl-hexa variable similar to ctl-arrow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 but that's bogus -- we need a more general solution. I
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 think you need to extend the concept of display tables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 into a more general conversion mechanism. Ideally you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812 could specify a Lisp function that converts characters,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 but this violates the Second Golden Rule and besides would
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 make things way way way way slow. An idea I like is to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 be able to specify multiple display tables instead of just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 one. Each display table can specify conversions for some
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817 characters and leave others unchanged. The way the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 character gets displayed is determined by the first display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 table with a binding for that character. This way, you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1820 could call a function `enable-hex-display' that adds a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 pre-defined hex display-table (or maybe computes one if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 you give weird parameters to the function) and adds it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823 to the list of display tables for the current buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 Unfortunately there are still problems dealing with Mule
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 characters. For example, maybe I want to specify that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 all extended characters (i.e. >= 256) are displayed in hex.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828 It's not reasonable to create a mapping for all possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829 such characters, because there are about 2^19 of them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 One way of dealing with this is to extend the concept
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831 of what a display table is. Currently it's only allowed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832 to be a 256-entry vector. Instead, it should be something
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833 like:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 a) A 256-entry vector, for backward compatibility
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836 b) Some sort of hashtable, mapping characters to values
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837 c) A list that specifies a range of values and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 mapping to provide for those values.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840 Also, extend the concept of "mapping" to include a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841 printf-like spec. Then, you could make all extended
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842 characters show up as hex with a display table like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 ((256 . 524288) . "%x")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 Since more than one display table is possible, you have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 great flexibility in mapping ranges of characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 Emchar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852 ? 255 : 160));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 /* The text display block for this display line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 /* The first time through the main loop we need to force the glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 data to be updated. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 int initial = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 /* Apparently the new extent_fragment_update returns an end position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 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
1863 displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 int no_more_frags = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 Lisp_Object synch_minibuffers_value =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 dl->used_prop_data = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 dl->num_chars = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872 memset (&data, 0, sizeof (data));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873 data.ef = extent_fragment_new (w->buffer, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875 /* These values are used by all of the rune addition routines. We add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 them to this structure for ease of passing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 data.db = db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 data.bi_bufpos = bi_start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 data.pixpos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884 data.last_charset = Qunbound;
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
1885 data.last_findex = DEFAULT_INDEX;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886 data.result_str = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1887
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1888 /* Set the right boundary adjusting it to take into account any end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889 glyph. Save the width of the end glyph for later use. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 data.max_pixpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1892 end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 data.max_pixpos -= end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897 if (cursor_in_echo_area)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 data.bi_cursor_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 else if (MINI_WINDOW_P (w) && !active_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908 data.cursor_type = NO_CURSOR;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
1909 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 data.bi_cursor_bufpos = BI_BUF_PT (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916 data.bi_cursor_bufpos = bi_marker_position (w->pointm[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917 data.cursor_type = CURSOR_ON;
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1921 data.cursor_x = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1922
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923 data.start_col = w->hscroll;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924 data.bi_start_col_enabled = (w->hscroll ? bi_start_pos : 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 /* We regenerate the line from the very beginning. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929 /* 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
1930 starting position is already equal to the maximum we can't add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931 anything else, right? Wrong. We might still have a newline to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 add. A newline can use the room allocated for an end glyph since
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933 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
1934 glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 /* #### Chuck -- I think this condition should be while (1).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 and the begin-glyph ends exactly at the end of the window, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939 end-glyph and text might not be displayed. while (1) ensures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1940 that the loop terminates only when either (a) there is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941 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
1942
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 #### Also I think you need to ensure that the operation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944 "add begin glyphs; add end glyphs; add text" is atomic and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 can't get interrupted in the middle. If you run off the end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946 of the line during that operation, then you keep accumulating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 propagation data until you're done. Otherwise, if the (e.g.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 there's a begin glyph at a particular position and attempting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 to display that glyph results in window-end being hit and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1950 propagation data being generated, then the character at that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 position won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 #### See also the comment after the end of this loop, below.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 while (data.pixpos <= data.max_pixpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 && (active_minibuffer || !NILP (synch_minibuffers_value)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958 /* #### This check probably should not be necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959 if (data.bi_bufpos > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961 /* #### urk! More of this lossage! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 data.bi_bufpos--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 /* If selective display was an integer and we aren't working on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 a continuation line then find the next line we are actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968 supposed to display. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 if (selective > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 && (data.bi_bufpos == BI_BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971 || BUF_FETCH_CHAR (b, prev_bytind (b, data.bi_bufpos)) == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 data.bi_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 if (data.bi_bufpos >= BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 data.bi_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985 /* Check for face changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 if (initial || (!no_more_frags && data.bi_bufpos == data.ef->end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 /* Now compute the face and begin/end-glyph information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989 data.findex =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 /* Remember that the extent-fragment routines deal in Bytind's. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991 extent_fragment_update (w, data.ef, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1992
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993 if (data.bi_bufpos == data.ef->end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994 no_more_frags = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 dt = get_display_table (w, data.findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 initial = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000 /* Determine what is next to be displayed. We first handle any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001 glyphs returned by glyphs_at_bufpos. If there are no glyphs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 display then we determine what to do based on the character at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 current buffer position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 /* If the current position is covered by an invisible extent, do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 nothing (except maybe add some ellipses).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008 #### The behavior of begin and end-glyphs at the edge of an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009 invisible extent should be investigated further. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010 fairly low priority though. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011 if (data.ef->invisible)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2013 /* #### Chuck, perhaps you could look at this code? I don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2014 really know what I'm doing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2015 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 *prop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2021 /* The extent fragment code only sets this when we should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2022 really display the ellipses. It makes sure the ellipses
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023 don't get displayed more than once in a row. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 if (data.ef->invisible_ellipses)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028 data.ef->invisible_ellipses_already_displayed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 data.ef->invisible_ellipses = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 /* Perhaps they shouldn't propagate if the very next thing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 is to display a newline (for compatibility with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 selective-display-ellipses)? Maybe that's too
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 abstruse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042 /* If point is in an invisible region we place it on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 next visible character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 && data.bi_bufpos == data.bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2046 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 data.cursor_type = NEXT_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 /* #### What if we we're dealing with a display table? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 if (data.start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 data.start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 if (data.bi_bufpos == BI_BUF_ZV (b))
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 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 /* If there is propagation data, then it represents the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061 buffer position being displayed. Add them and advance the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 position counter. This might also add the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2063 prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 else if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 dl->used_prop_data = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 *prop = add_propagation_runes (prop, &data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070 goto done; /* gee, a really narrow window */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071 else if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 else if (data.bi_bufpos < BI_BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 data.bi_bufpos = BI_BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080 /* If there are end glyphs, add them to the line. These are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081 the end glyphs for the previous run of text. We add them
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082 here rather than doing them at the end of handling the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083 previous run so that glyphs at the beginning and end of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084 a line are handled correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 else if (Dynarr_length (data.ef->end_glyphs) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087 *prop = add_glyph_runes (&data, END_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2092 /* If there are begin glyphs, add them to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100 /* If at end-of-buffer, we've already processed begin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101 end-glyphs at this point and there's no text to process,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 so we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 else if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2107 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108 /* Get the character at the current buffer position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 /* If there is a display table entry for it, hand it off to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112 add_disp_table_entry_runes and let it worry about it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 if (dt && !NILP (DISP_CHAR_ENTRY (dt, data.ch)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 *prop =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 add_disp_table_entry_runes (&data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 DISP_CHAR_ENTRY (dt, data.ch));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119 if (*prop)
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123 /* Check if we have hit a newline character. If so, add a marker
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 to the line and end this loop. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125 else if (data.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 /* We aren't going to be adding an end glyph so give its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128 space back in order to make sure that the cursor can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 fit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 if (selective > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 && (bi_spaces_at_point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134 (b, next_bytind (b, data.bi_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135 >= selective))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 if (!NILP (b->selective_display_ellipses))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2140
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 /* Cheesy, cheesy, cheesy. We mark the end of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149 line with a special "character rune" whose width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150 is the EOL cursor width and whose character is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2151 the non-printing character '\n'. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2152 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156 /* We need to set data.bi_bufpos to the start of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157 next visible region in order to make this line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158 appear to contain all of the invisible area.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159 Otherwise, the line cache won't work
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2163 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 data.bi_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 if (data.bi_bufpos >= BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 data.bi_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2169 break;
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 if (BI_BUF_FETCH_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 (b, prev_bytind (b, data.bi_bufpos)) == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174 DEC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185 /* If the current character is ^M, and selective display is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186 enabled, then add the invisible-text-glyph if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2187 selective-display-ellipses is set. In any case, this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2188 line is done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189 else if (data.ch == (('M' & 037)) && selective == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191 Bytind bi_next_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2193 /* Find the buffer position at the end of the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2194 bi_next_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2195 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2196 if (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_next_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2197 == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2198 DEC_BYTIND (b, bi_next_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2200 /* If the cursor is somewhere in the elided text make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2201 sure that the cursor gets drawn appropriately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2202 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2203 && (data.bi_cursor_bufpos >= data.bi_bufpos &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2204 data.bi_cursor_bufpos < bi_next_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2205 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2206 data.cursor_type = NEXT_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2207 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2208
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2209 /* We won't be adding a truncation or continuation glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2210 so give up the room allocated for them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2211 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2212
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2213 if (!NILP (b->selective_display_ellipses))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2214 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2215 /* We don't propagate anything from the invisible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2216 text glyph if it fails to fit. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2217 intentional. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2218 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2220 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2221 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2222 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2223 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2224 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2225
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2226 /* Set the buffer position to the end of the line. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2227 need to do this before potentially adding a newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2228 so that the cursor flag will get set correctly (if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2229 needed). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2230 data.bi_bufpos = bi_next_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2232 if (NILP (b->selective_display_ellipses)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2233 || data.bi_cursor_bufpos == bi_next_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2234 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2235 /* We have to at least add a newline character so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2236 that the cursor shows up properly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2237 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2238 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2239 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2240 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2241 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2242
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2243 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2244 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2245
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2246 /* This had better be a newline but doing it this way
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2247 we'll see obvious incorrect results if it isn't. No
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2248 need to abort here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2249 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_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 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2252 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2253
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2254 /* If the current character is considered to be printable, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2255 just add it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2256 else if (data.ch >= printable_min)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2257 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2258 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2259 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2260 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2261 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2263 /* If the current character is a tab, determine the next tab
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2264 starting position and add a blank rune which extends from the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2265 current pixel position to that starting position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2266 else if (data.ch == '\t')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2267 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2268 int tab_start_pixpos = data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2269 int next_tab_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2270 int char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2271 int prop_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2272
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2273 if (data.start_col > 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2274 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2275
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2276 next_tab_start = next_tab_position (w, tab_start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2277 dl->bounds.left_in);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2278 if (next_tab_start > data.max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2279 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2280 prop_width = next_tab_start - data.max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2281 next_tab_start = data.max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2282 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2283 data.blank_width = next_tab_start - data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2284 char_tab_width =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2285 (next_tab_start - tab_start_pixpos) / space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2286
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2287 *prop = add_blank_rune (&data, w, char_tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2289 /* add_blank_rune is only supposed to be called with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2290 sizes guaranteed to fit in the available space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2291 assert (!(*prop));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2292
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2293 if (prop_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2294 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2295 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2296 *prop = Dynarr_new (struct prop_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2297
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2298 pb.type = PROP_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2299 pb.data.p_blank.width = prop_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2300 pb.data.p_blank.findex = data.findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2301 Dynarr_add (*prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2302
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2303 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2304 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2305 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2307 /* If character is a control character, pass it off to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2308 add_control_char_runes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2309
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2310 The is_*() routines have undefined results on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2311 arguments outside of the range [-1, 255]. (This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2312 often bites people who carelessly use `char' instead
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2313 of `unsigned char'.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2314 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2315 else if (data.ch < 0x100 && iscntrl ((Bufbyte) data.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2316 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2317 *prop = add_control_char_runes (&data, b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2319 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2320 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2321 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2323 /* If the character is above the ASCII range and we have not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2324 already handled it, then print it as an octal number. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2325 else if (data.ch >= 0200)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2326 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2327 *prop = add_octal_runes (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2328
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2329 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2330 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2331 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2333 /* Assume the current character is considered to be printable,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2334 then just add it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2335 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2336 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2337 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2338 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2339 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2340 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2342 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2343 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2344 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2346 done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2347
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2348 /* 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
2349 end of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2350 if (data.bi_bufpos < BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2351 && (active_minibuffer || !NILP (synch_minibuffers_value)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2352 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2353 /* #### This check is not correct. If the line terminated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2354 due to a begin-glyph or end-glyph hitting window-end, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2355 data.ch will not point to the character at data.bi_bufpos. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2356 you make the two changes mentioned at the top of this loop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2357 you should be able to say '(if (*prop))'. That should also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2358 make it possible to eliminate the data.bi_bufpos < BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2359 check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2360
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2361 /* The common case is that the line ended because we hit a newline.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2362 In that case, the next character is just the next buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2363 position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2364 if (data.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2365 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2366 /* If data.start_col_enabled is still true, then the window is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2367 scrolled far enough so that nothing on this line is visible.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2368 We need to stick a trunctation glyph at the beginning of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2369 line in that case unless the line is completely blank. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2370 if (data.bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2371 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2372 if (data.cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2373 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2374 if (data.bi_cursor_bufpos >= bi_start_pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2375 && data.bi_cursor_bufpos <= data.bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2376 data.bi_cursor_bufpos = data.bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2377 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2378 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2379 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2380 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2382 if (data.bi_bufpos != bi_start_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2383 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2384 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2385
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2386 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2387 gb.glyph = Vhscroll_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2388 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2389 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2390 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2391 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2392 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2393 /* This duplicates code down below to add a newline to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2394 the end of an otherwise empty line.*/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2395 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2396 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2397
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2398 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2399 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2400 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2401
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2402 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2403 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2404
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2405 /* Otherwise we have a buffer line which cannot fit on one display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2406 line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2407 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2408 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2409 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2410 struct glyph_cachel *cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2412 /* If the line is to be truncated then we actually have to look
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2413 for the next newline. We also add the end-of-line glyph which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2414 we know will fit because we adjusted the right border before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2415 we starting laying out the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2416 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2417 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2418 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2419
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2420 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2421 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2422 Bytind bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2423
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2424 /* Now find the start of the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2425 bi_pos = bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2427 /* If the cursor is past the truncation line then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2428 make it appear on the truncation glyph. If we've hit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2429 the end of the buffer then we also make the cursor
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
2430 appear unless eob is immediately preceded by a
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2431 newline. In that case the cursor should actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2432 appear on the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2433 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2434 && data.bi_cursor_bufpos >= data.bi_bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2435 && (data.bi_cursor_bufpos < bi_pos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2436 (bi_pos == BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2437 && (bi_pos == BI_BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2438 || (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2439 != '\n')))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2440 data.bi_cursor_bufpos = bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2441 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2442 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2444 data.bi_bufpos = bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2445 gb.glyph = Vtruncation_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2446 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2447 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2448 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2449 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2450 /* The cursor can never be on the continuation glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2451 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2453 /* data.bi_bufpos is already at the start of the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2454
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2455 gb.glyph = Vcontinuation_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2456 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2457 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2458
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2459 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1, cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2461 if (truncate_win && data.bi_bufpos == BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2462 && BI_BUF_FETCH_CHAR (b, prev_bytind (b, BI_BUF_ZV (b))) != '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2463 /* #### Damn this losing shit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2464 data.bi_bufpos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2465 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2466 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2467 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2468 && (!echo_area_active (f) || data.bi_bufpos == BI_BUF_ZV (b)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2469 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2470 /* 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
2471 newline character in order for the cursor to get drawn. We label
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2472 it as a newline so that it gets handled correctly by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2473 whitespace routines below. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2475 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2476 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2477 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2478 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2479 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2480
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2481 data.max_pixpos += data.blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2482 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2483 data.max_pixpos -= data.blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2484
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2485 /* #### urk! Chuck, this shit is bad news. Going around
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2486 manipulating invalid positions is guaranteed to result in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2487 trouble sooner or later. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2488 data.bi_bufpos = BI_BUF_ZV (b) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2489 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2491 /* Calculate left whitespace boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2492 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2493 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2494
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2495 /* Whitespace past a newline is considered right whitespace. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2496 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2497 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2498 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2499
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2500 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2501 || rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2502 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2503 dl->bounds.left_white += rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2504 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2505 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2506 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2507 elt = Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2508 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2509 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2510
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2511 /* Calculate right whitespace boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2512 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2513 int elt = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2514 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2516 while (!done && elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2517 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2518 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2519
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2520 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2521 && isspace (rb->object.chr.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2522 && !rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2523 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2524 dl->bounds.right_white = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2525 done = 1;
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 elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2529
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2530 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2532 /* The line is blank so everything is considered to be right
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2533 whitespace. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2534 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2535 dl->bounds.right_white = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2536 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2538 /* Set the display blocks bounds. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2539 db->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2540 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2541 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2542 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2543
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2544 db->end_pos = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2545 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2546 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2547 db->end_pos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2549 /* update line height parameters */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2550 if (!data.new_ascent && !data.new_descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2551 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2552 /* We've got a blank line so initialize these values from the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2553 face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2554 default_face_font_info (data.window, &data.new_ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2555 &data.new_descent, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2556 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2557
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2558 if (data.max_pixmap_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2559 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2560 int height = data.new_ascent + data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2561 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2562
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2563 pix_descent = data.max_pixmap_height * data.new_descent / height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2564 pix_ascent = data.max_pixmap_height - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2566 data.new_ascent = max (data.new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2567 data.new_descent = max (data.new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2568 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2569
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2570 dl->ascent = data.new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2571 dl->descent = data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2573 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2574 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
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 (dl->ascent < ascent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2577 dl->ascent = ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2578 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2579 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2580 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2581
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2582 if (dl->descent < descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2583 dl->descent = descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2584 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2586 dl->cursor_elt = data.cursor_x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2587 /* #### lossage lossage lossage! Fix this shit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2588 if (data.bi_bufpos > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2589 dl->end_bufpos = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2590 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2591 dl->end_bufpos = bytind_to_bufpos (b, data.bi_bufpos) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2592 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2593 data.dl->num_chars = column_at_point (b, dl->end_bufpos, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2594 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2595 /* This doesn't correctly take into account tabs and control
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2596 characters but if the window isn't being truncated then this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2597 value isn't going to end up being used anyhow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2598 data.dl->num_chars = dl->end_bufpos - dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2599
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2600 /* #### handle horizontally scrolled line with text none of which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2601 was actually laid out. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2602
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2603 /* #### handle any remainder of overlay arrow */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2604
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2605 if (*prop == ADD_FAILED)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2606 *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2607
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2608 if (truncate_win && *prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2609 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2610 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2611 *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2612 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2613
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2614 extent_fragment_delete (data.ef);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2616 /* #### If we started at EOB, then make sure we return a value past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2617 it so that regenerate_window will exit properly. This is bogus.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2618 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
2619 this function if we are already at EOB. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2620
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2621 if (data.bi_bufpos == BI_BUF_ZV (b) && bi_start_pos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2622 return (data.bi_bufpos + 1); /* Yuck! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2623 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2624 return data.bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2625 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2626
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2627 /* Display the overlay arrow at the beginning of the given line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2629 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2630 create_overlay_glyph_block (struct window *w, struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2631 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2632 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2633 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2634 pos_data data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2635
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2636 /* If Voverlay_arrow_string isn't valid then just fail silently. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2637 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2638 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2639
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2640 memset (&data, 0, sizeof (data));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2641 data.ef = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2642 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2643 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2644 data.db = get_display_block_from_line (dl, OVERWRITE);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2645 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2646 data.pixpos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2647 data.max_pixpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2648 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2649 data.cursor_x = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2650 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2651 data.last_charset = Qunbound;
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
2652 data.last_findex = DEFAULT_INDEX;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2653 data.result_str = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2654
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2655 Dynarr_reset (data.db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2656
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2657 if (STRINGP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2658 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2659 add_bufbyte_string_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2660 (&data,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
2661 XSTRING_DATA (Voverlay_arrow_string),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
2662 XSTRING_LENGTH (Voverlay_arrow_string),
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2663 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2664 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2665 else if (GLYPHP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2666 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2667 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2668
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2669 gb.glyph = Voverlay_arrow_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2670 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2671 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2672 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2673
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2674 if (data.max_pixmap_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2675 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2676 int height = data.new_ascent + data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2677 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2678
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2679 pix_descent = data.max_pixmap_height * data.new_descent / height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2680 pix_ascent = data.max_pixmap_height - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2681
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2682 data.new_ascent = max (data.new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2683 data.new_descent = max (data.new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2684 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2685
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2686 dl->ascent = data.new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2687 dl->descent = data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2689 data.db->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2690 data.db->end_pos = data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2691
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2692 return (data.pixpos - dl->bounds.left_in);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2693 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2694
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2695 /* Add a type of glyph to a margin display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2697 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2698 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2699 int count, int glyph_type, int side, Lisp_Object window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2700 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2701 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2702 ? dl->left_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2703 : dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2704 int elt, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2705 int xpos = start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2706 int reverse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2707
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2708 if ((glyph_type == GL_WHITESPACE && side == LEFT_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2709 || (glyph_type == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2710 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2711 reverse = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2712 elt = Dynarr_length (gbd) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2713 end = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2714 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2715 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2716 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2717 reverse = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2718 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2719 end = Dynarr_length (gbd);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2720 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2721
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2722 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2723 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2724 struct glyph_block *gb = Dynarr_atp (gbd, elt);
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 (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2727 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2728
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2729 if (gb->active &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2730 ((side == LEFT_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2731 extent_begin_glyph_layout (XEXTENT (gb->extent)) == glyph_type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2732 || (side == RIGHT_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2733 extent_end_glyph_layout (XEXTENT (gb->extent)) == glyph_type)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2734 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2735 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2736
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2737 rb.width = gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2738 rb.findex = gb->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2739 rb.xpos = xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2740 rb.bufpos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2741 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2742 rb.type = RUNE_DGLYPH;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2743 rb.object.dglyph.glyph = gb->glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2744 rb.object.dglyph.extent = gb->extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2745 rb.object.dglyph.xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2746 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2748 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2749 xpos += rb.width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2750 count--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2751 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2752
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2753 if (glyph_contrib_p (gb->glyph, window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2754 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2755 unsigned short ascent, descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2756 Lisp_Object baseline = glyph_baseline (gb->glyph, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2757
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2758 ascent = glyph_ascent (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2759 descent = glyph_descent (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2760
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2761 /* A pixmap that has not had a baseline explicitly set.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2762 We use the existing ascent / descent ratio of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2763 line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2764 if (NILP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2765 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2766 int gheight = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2767 int line_height = dl->ascent + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2768 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2769
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2770 pix_descent = (int) (gheight * dl->descent) / line_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2771 pix_ascent = gheight - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2772
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2773 dl->ascent = max ((int) dl->ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2774 dl->descent = max ((int) dl->descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2775 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2776
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2777 /* A string so determine contribution normally. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2778 else if (EQ (baseline, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2779 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2780 dl->ascent = max (dl->ascent, ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2781 dl->descent = max (dl->descent, descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2782 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2783
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2784 /* A pixmap with an explicitly set baseline. We determine the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2785 contribution here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2786 else if (INTP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2787 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2788 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2789 int pix_ascent, 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 pix_ascent = height * XINT (baseline) / 100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2792 pix_descent = height - pix_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2794 dl->ascent = max ((int) dl->ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2795 dl->descent = max ((int) dl->descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2796 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2797
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2798 /* Otherwise something is screwed up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2799 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2800 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2801 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2802 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2803
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2804 (reverse ? elt-- : elt++);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2805 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2806
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2807 return xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2808 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2809
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2810 /* Add a blank to a margin display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2811
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2812 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2813 add_margin_blank (struct display_line *dl, struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2814 struct window *w, int xpos, int width, int side)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2815 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2816 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2817
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2818 rb.findex = (side == LEFT_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2819 ? get_builtin_face_cache_index (w, Vleft_margin_face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2820 : get_builtin_face_cache_index (w, Vright_margin_face));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2821 rb.xpos = xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2822 rb.width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2823 rb.bufpos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2824 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2825 rb.type = RUNE_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2826 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2827
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2828 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2829 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2830
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2831 /* Display glyphs in the left outside margin, left inside margin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2832 left whitespace area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2834 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2835 create_left_glyph_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2836 int overlay_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2837 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2838 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2839
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2840 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2841 int elt, end_xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2842 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
2843 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
2844 int left_in_start = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2845 int left_in_end = dl->bounds.left_in + overlay_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2846
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2847 struct display_block *odb, *idb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2849 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2850
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2851 /* We have to add the glyphs to the line in the order outside,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2852 inside, whitespace. However the precedence dictates that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2853 determine how many will fit in the reverse order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2854
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2855 /* Determine how many whitespace glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2856 they should start. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2857 white_in_start = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2858 white_out_start = left_in_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2859 white_out_cnt = white_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2860 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2862 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2863 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2864 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2865
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2866 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2867 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2868
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2869 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2870 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2871 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2872
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2873 width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2874
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2875 if (white_in_start - width >= left_in_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2876 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2877 white_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2878 white_in_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2879 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2880 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2881 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2882 else if (use_overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2883 && (white_out_start - width > dl->bounds.left_out))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2884 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2885 white_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2886 white_out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2887 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2888 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2889 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2890 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2891 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2892 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2893
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2894 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2895 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2896
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2897 /* Determine how many inside margin glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2898 they should start. The inside margin glyphs get whatever space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2899 is left after the whitespace glyphs have been displayed. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2900 are tricky to calculate since if we decide to use the overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2901 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
2902 list of just the inside margin glyphs and manipulate it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2903 determine the needed info. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2904 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2905 glyph_block_dynarr *ib;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2906 int avail_in, avail_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2907 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2908 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2909 int used_in, used_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2911 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2912 used_in = used_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2913 ib = Dynarr_new (struct glyph_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2914 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2915 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2916 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2917
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2918 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2919 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2920
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2921 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2922 GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2923 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2924 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2925 used_in += gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2926 Dynarr_add (ib, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2927 }
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++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2930 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2931
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2932 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2933 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2934 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2935 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2936 avail_in = white_in_start - left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2937 if (avail_in < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2938 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2939 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2940
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2941 if (!use_overflow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2942 avail_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2943 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2944 avail_out = white_out_start - dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2945
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2946 marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2947 while (!done && marker < Dynarr_length (ib))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2948 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2949 int width = Dynarr_atp (ib, marker)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2950
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2951 /* If everything now fits in the available inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2952 space, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2953 if (used_in <= avail_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2954 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2955 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2956 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2957 /* Otherwise see if we have room to move a glyph to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2958 outside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2959 if (used_out + width <= avail_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2960 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2961 used_out += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2962 used_in -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2963 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2964 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2965 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2966 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2967
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2968 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2969 marker++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2970 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2971
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2972 /* At this point we now know that everything from marker on goes in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2973 the inside margin and everything before it goes in the outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2974 margin. The stuff going into the outside margin is guaranteed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2975 to fit, but we may have to trim some stuff from the inside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2977 in_in_end = left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2978 in_out_start = white_out_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2979 in_out_cnt = in_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2980
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2981 Dynarr_free (ib);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2982 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2983 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2984 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2985 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2987 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2988 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2990 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2991 GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2992 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2993 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2994
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2995 if (used_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2996 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2997 in_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2998 in_out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2999 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3000 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3001 used_out -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3002 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3003 else if (in_in_end + width < white_in_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3004 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3005 in_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3006 in_in_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3007 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3008 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3009 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3010 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3011 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3012 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3013
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3014 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3015 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3016 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3017
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3018 /* Determine how many outside margin glyphs we can display. They
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3019 always start at the left outside margin and can only use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3020 outside margin space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3021 out_end = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3022 out_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3023 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3024
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3025 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3026 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3027 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3028
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3029 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3030 abort (); /* these should have beeb handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3032 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3033 GL_OUTSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3034 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3035 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3037 if (out_end + width <= in_out_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3038 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3039 out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3040 out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3041 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3042 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3043 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3044 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3045 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3046 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3047
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3048 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3049 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3050
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3051 /* Now that we now where everything goes, we add the glyphs as runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3052 to the appropriate display blocks. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3053 if (out_cnt || in_out_cnt || white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3054 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3055 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3056 odb->start_pos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3057 /* #### We should stop adding a blank to account for the space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3058 between the end of the glyphs and the margin and instead set
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3059 this accordingly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3060 odb->end_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3061 Dynarr_reset (odb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3062 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3063 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3064 odb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3065
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3066 if (in_in_cnt || white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3067 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3068 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3069 idb->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3070 /* #### See above comment for odb->end_pos */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3071 idb->end_pos = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3072 Dynarr_reset (idb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3073 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3074 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3075 idb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3076
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3077 /* First add the outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3078 if (out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3079 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3080 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
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 end_xpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3084 /* There may be blank space between the outside margin glyphs and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3085 the inside margin glyphs. If so, add a blank. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3086 if (in_out_cnt && (in_out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3087 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3088 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3089 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3090 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3091
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3092 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3093 outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3094 if (in_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3095 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3096 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3097 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3098 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3099
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3100 /* If we didn't add any inside margin glyphs to the outside margin,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3101 but are adding whitespace glyphs, then we need to add a blank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3102 here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3103 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3104 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3105 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3106 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3107 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3108
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3109 /* Next add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3110 outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3111 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3112 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3113 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3114 GL_WHITESPACE, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3115 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3116
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3117 /* We take care of clearing between the end of the glyphs and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3118 start of the inside margin for lines which have glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3119 if (odb && (left_in_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3120 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3121 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3122 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3123 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3125 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3126 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3127 if (in_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3128 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3129 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3130 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3131 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3132 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3133 end_xpos = left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3134
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3135 /* Make sure that the area between the end of the inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3136 glyphs and the whitespace glyphs is cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3137 if (idb && (white_in_start - end_xpos > 0))
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, idb, w, end_xpos, white_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 whitespace 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 (white_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 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3148 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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3151 /* Whitespace glyphs always end right next to the text block so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3152 there is nothing we have to make sure is cleared after them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3153 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3155 /* Display glyphs in the right outside margin, right inside margin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3156 right whitespace area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3157
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3158 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3159 create_right_glyph_block (struct window *w, struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3160 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3161 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3163 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3164 int elt, end_xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3165 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
3166 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
3167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3168 struct display_block *odb, *idb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3169
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3170 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3172 /* We have to add the glyphs to the line in the order outside,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3173 inside, whitespace. However the precedence dictates that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3174 determine how many will fit in the reverse order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3176 /* Determine how many whitespace glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3177 they should start. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3178 white_in_end = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3179 white_out_end = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3180 white_out_cnt = white_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3181 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3182
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3183 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3184 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3185 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3186
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3187 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3188 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3190 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3191 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3192 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3194 if (white_in_end + width <= dl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3195 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3196 white_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3197 white_in_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3198 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3199 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3200 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3201 else if (use_overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3202 && (white_out_end + width <= dl->bounds.right_out))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3203 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3204 white_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3205 white_out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3206 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3207 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3208 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3209 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3210 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3211 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3212
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3213 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3214 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3216 /* Determine how many inside margin glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3217 they should start. The inside margin glyphs get whatever space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3218 is left after the whitespace glyphs have been displayed. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3219 are tricky to calculate since if we decide to use the overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3220 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
3221 list of just the inside margin glyphs and manipulate it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3222 determine the needed info. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3223 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3224 glyph_block_dynarr *ib;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3225 int avail_in, avail_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3226 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3227 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3228 int used_in, used_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3230 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3231 used_in = used_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3232 ib = Dynarr_new (struct glyph_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3233 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3234 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3235 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3237 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3238 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3239
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3240 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3241 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3242 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3243 used_in += gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3244 Dynarr_add (ib, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3245 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3247 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3248 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3249
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3250 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3251 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3252 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3253 avail_in = dl->bounds.right_in - white_in_end;
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 (!use_overflow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3256 avail_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3257 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3258 avail_out = dl->bounds.right_out - white_out_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3259
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3260 marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3261 while (!done && marker < Dynarr_length (ib))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3262 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3263 int width = Dynarr_atp (ib, marker)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3264
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3265 /* If everything now fits in the available inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3266 space, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3267 if (used_in <= avail_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3268 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3269 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3270 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3271 /* Otherwise see if we have room to move a glyph to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3272 outside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3273 if (used_out + width <= avail_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3274 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3275 used_out += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3276 used_in -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3277 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3278 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3279 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3280 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3281
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3282 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3283 marker++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3284 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3286 /* At this point we now know that everything from marker on goes in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3287 the inside margin and everything before it goes in the outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3288 margin. The stuff going into the outside margin is guaranteed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3289 to fit, but we may have to trim some stuff from the inside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3291 in_in_start = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3292 in_out_end = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3293 in_out_cnt = in_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3295 Dynarr_free (ib);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3296 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3297 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3298 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3299 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3300
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3301 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3302 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3303
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3304 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3305 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3306 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3307
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3308 if (used_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3309 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3310 in_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3311 in_out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3312 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3313 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3314 used_out -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3315 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3316 else if (in_in_start - width >= white_in_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3317 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3318 in_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3319 in_in_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3320 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3321 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3322 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3323 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3324 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3325 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3327 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3328 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3329 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3330
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3331 /* Determine how many outside margin glyphs we can display. They
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3332 always start at the right outside margin and can only use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3333 outside margin space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3334 out_start = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3335 out_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3336 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3337
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3338 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3339 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3340 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3342 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3343 abort (); /* these should have beeb handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3344
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3345 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3346 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3347 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3349 if (out_start - width >= in_out_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3350 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3351 out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3352 out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3353 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3354 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3355 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3356 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3357 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3358 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3360 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3361 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3362
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3363 /* Now that we now where everything goes, we add the glyphs as runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3364 to the appropriate display blocks. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3365 if (out_cnt || in_out_cnt || white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3366 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3367 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3368 /* #### See comments before odb->start_pos init in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3369 create_left_glyph_block */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3370 odb->start_pos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3371 odb->end_pos = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3372 Dynarr_reset (odb->runes);
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 odb = 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 if (in_in_cnt || white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3378 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3379 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3380 idb->start_pos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3381 /* #### See comments before odb->start_pos init in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3382 create_left_glyph_block */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3383 idb->end_pos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3384 Dynarr_reset (idb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3385 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3386 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3387 idb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3388
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3389 /* First add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3390 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3391 if (white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3392 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3393 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3394 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3395 window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3396 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3397 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3398 end_xpos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3399
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3400 /* Make sure that the area between the end of the whitespace glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3401 and the inside margin glyphs is cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3402 if (in_in_cnt && (in_in_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3403 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3404 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3405 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3406 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3408 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3409 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3410 if (in_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3411 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3412 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3413 GL_INSIDE_MARGIN, RIGHT_GLYPHS, 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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3416 /* 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
3417 of the inside margin area gets cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3418 if (idb && (dl->bounds.right_in - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3419 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3420 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
3421 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3422 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3423
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3424 /* Next add any whitespace glyphs in the outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3425 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3426 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3427 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
3428 GL_WHITESPACE, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3429 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3430 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3431 end_xpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3432
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3433 /* Next add any inside margin glyphs in the outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3434 if (in_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3435 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3436 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3437 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3438 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3439
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3440 /* There may be space between any whitespace or inside margin glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3441 in the outside margin and the actual outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3442 if (odb && (out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3443 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3444 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3445 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3446 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3448 /* Finally, add the outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3449 if (out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3450 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3451 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3452 RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3453 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3454 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3455
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 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3459 /* modeline routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3460 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3461 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3463 /* Ensure that the given display line DL accurately represents the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3464 modeline for the given window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3466 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3467 generate_modeline (struct window *w, struct display_line *dl, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3468 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3469 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3470 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3471 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3472
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3473 /* Unlike display line and rune pointers, this one can't change underneath
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3474 our feet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3475 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3476 int max_pixpos, min_pixpos, ypos_adj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3477 Lisp_Object font_inst;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3479 /* This will actually determine incorrect inside boundaries for the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3480 modeline since it ignores the margins. However being aware of this fact
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3481 we never use those values anywhere so it doesn't matter. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3482 dl->bounds = calculate_display_line_boundaries (w, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3483
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3484 /* We are generating a modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3485 dl->modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3486 dl->cursor_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3488 /* Reset the runes on the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3489 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3491 if (!WINDOW_HAS_MODELINE_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3492 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3493 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3494
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3495 /* If there is a horizontal scrollbar, don't add anything. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3496 if (window_scrollbar_height (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3497 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3498
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3499 dl->ascent = DEVMETH (d, divider_height, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3500 dl->descent = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3501 /* The modeline is at the bottom of the gutters. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3502 dl->ypos = WINDOW_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3504 rb.findex = MODELINE_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3505 rb.xpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3506 rb.width = dl->bounds.right_out - dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3507 rb.bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3508 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3509 rb.type = RUNE_HLINE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3510 rb.object.hline.thickness = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3511 rb.object.hline.yoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3512 rb.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3514 if (!EQ (Qzero, w->modeline_shadow_thickness)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3515 && FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3516 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3517 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3519 dl->ypos -= shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3520 rb.xpos += shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3521 rb.width -= 2 * shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3522 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3524 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3525 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3526 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3527
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3528 /* !!#### not right; needs to compute the max height of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3529 all the charsets */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3530 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3532 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3533 dl->descent = XFONT_INSTANCE (font_inst)->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3534
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3535 min_pixpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3536 max_pixpos = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3538 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3539 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3540 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3542 ypos_adj = shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3543 min_pixpos += shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3544 max_pixpos -= shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3545 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3546 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3547 ypos_adj = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3549 generate_formatted_string_db (b->modeline_format,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3550 b->generated_modeline_string, w, dl, db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3551 MODELINE_INDEX, min_pixpos, max_pixpos, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3552
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3553 /* 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
3554 set this until we've generated teh modeline in order to account
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3555 for any embedded faces. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3556 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3557 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3559 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3560 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3561 struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3562 struct display_block *db, face_index findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3563 int min_pixpos, int max_pixpos, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3564 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3565 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3566 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3567
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3568 pos_data data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3569 int c_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3570
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3571 memset (&data, 0, sizeof (data));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3572 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3573 data.db = db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3574 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3575 data.findex = findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3576 data.pixpos = min_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3577 data.max_pixpos = max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3578 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3579 data.last_charset = Qunbound;
94
1040fe1366ac Import from CVS: tag xemacs-20-0f2
cvs
parents: 86
diff changeset
3580 data.last_findex = DEFAULT_INDEX;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3581 data.result_str = result_str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3582 data.is_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3583 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3584
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3585 Dynarr_reset (formatted_string_extent_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3586 Dynarr_reset (formatted_string_extent_start_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3587 Dynarr_reset (formatted_string_extent_end_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3589 /* This recursively builds up the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3590 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3591 max_pixpos - min_pixpos, findex, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3592
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3593 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3594 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3595 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3596 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3597 c_pixpos = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3598 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3599 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3600 c_pixpos = min_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3601
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3602 /* 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
3603 to make up the difference. This usually only occurs if the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3604 modeline face is using a proportional width font or a fixed width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3605 font of a different size from the default face font. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3607 if (c_pixpos < max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3608 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3609 data.pixpos = c_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3610 data.blank_width = max_pixpos - data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3612 add_blank_rune (&data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3613 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3614
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3615 /* Now create the result string and frob the extents into it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3616 if (!NILP (result_str))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3617 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3618 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3619 Bytecount len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3620 Bufbyte *strdata;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3621 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3623 detach_all_extents (result_str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3624 resize_string (XSTRING (result_str), -1,
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
3625 data.bytepos - XSTRING_LENGTH (result_str));
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
3626
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
3627 strdata = XSTRING_DATA (result_str);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3629 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3630 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3631 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3632 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3633 len += (set_charptr_emchar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3634 (strdata + len, Dynarr_atp (db->runes,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3635 elt)->object.chr.ch));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3636 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3637 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3639 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3640 elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3641 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3642 Lisp_Object extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3643 Lisp_Object child;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3644
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3645 XSETEXTENT (extent, Dynarr_at (formatted_string_extent_dynarr, elt));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3646 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3647 if (NILP (child))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3648 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3649 child = Fmake_extent (Qnil, Qnil, result_str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3650 Fputhash (extent, child, buf->modeline_extent_table);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3651 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3652 Fset_extent_parent (child, extent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3653 set_extent_endpoints
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3654 (XEXTENT (child),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3655 Dynarr_at (formatted_string_extent_start_dynarr, elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3656 Dynarr_at (formatted_string_extent_end_dynarr, elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3657 result_str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3658 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3659 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3660 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3661
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3662 static Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3663 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
3664 Charcount pos, Charcount min_pos, Charcount max_pos)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3665 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3666 /* This function has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3667 Charcount end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3668 CONST Bufbyte *cur_pos = str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3669 struct display_block *db = data->db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3670
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3671 data->blank_width = space_width (XWINDOW (data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3672 while (Dynarr_length (db->runes) < pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3673 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3674
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3675 end = (Dynarr_length (db->runes) +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3676 bytecount_to_charcount (str, strlen ((CONST char *) str)));
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3677 if (max_pos != -1)
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3678 end = min (max_pos, end);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3679
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3680 while (pos < end && *cur_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3681 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3682 CONST Bufbyte *old_cur_pos = cur_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3683 int succeeded;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3684
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3685 data->ch = charptr_emchar (cur_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3686 succeeded = (add_emchar_rune (data) != ADD_FAILED);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3687 INC_CHARPTR (cur_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3688 if (succeeded)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3689 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3690 pos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3691 data->modeline_charpos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3692 data->bytepos += cur_pos - old_cur_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3693 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3694 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3695
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3696 while (Dynarr_length (db->runes) < min_pos &&
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3697 (data->pixpos + data->blank_width <= data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3698 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3699
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3700 return Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3701 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3702
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3703 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3704 modeline extents. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3705 static Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3706 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
3707 Charcount pos, Charcount min_pos, Charcount max_pos)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3708 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3709 /* This function has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3710 Charcount end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3711 struct display_block *db = data->db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3712 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3713
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3714 data->blank_width = space_width (XWINDOW (data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3715 while (Dynarr_length (db->runes) < pos)
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 end = Dynarr_length (db->runes) + 1;
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3719 if (max_pos != -1)
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
3720 end = min (max_pos, end);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3721
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3722 gb.glyph = glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3723 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3724 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3725 pos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3726
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3727 while (Dynarr_length (db->runes) < pos &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3728 (data->pixpos + data->blank_width <= data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3729 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3730
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3731 return Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3732 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3733
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3734 /* 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
3735 true of max_pixsize. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3736 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3737 if (Dynarr_length (data->db->runes)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3738 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3739 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3740 cur_pixsize = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3742 /* Note that this function does "positions" in terms of characters and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3743 not in terms of columns. This is necessary to make the formatting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3744 work correctly when proportional width fonts are used in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3745 modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3746 static Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3747 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3748 Charcount min_pos, Charcount max_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3749 Lisp_Object elt, int depth, int max_pixsize,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3750 face_index findex, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3751 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3752 /* This function has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3753 /* #### The other losing things in this function are:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3754
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3755 -- C zero-terminated-string lossage.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3756 -- Non-printable characters should be converted into something
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3757 appropriate (e.g. ^F) instead of blindly being printed anyway.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3758 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3759
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3760 tail_recurse:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3761 if (depth > 10)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3762 goto invalid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3764 depth++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3765
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3766 if (STRINGP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3767 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3768 /* A string. Add to the display line and check for %-constructs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3769 within it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3770
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
3771 Bufbyte *this = XSTRING_DATA (elt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3772
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3773 while ((pos < max_pos || max_pos == -1) && *this)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3774 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3775 Bufbyte *last = this;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3776
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3777 while (*this && *this != '%')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3778 this++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3779
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3780 if (this != last)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3781 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3782 /* The string is just a string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3783 Charcount size =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3784 bytecount_to_charcount (last, this - last) + pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3785 Charcount tmp_max = (max_pos == -1 ? size : min (size, max_pos));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3786
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3787 pos = add_string_to_fstring_db_runes (data, last, pos, pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3788 tmp_max);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3789 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3790 else /* *this == '%' */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3791 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3792 Charcount spec_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3794 this++; /* skip over '%' */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3795
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3796 /* We can't allow -ve args due to the "%-" construct.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3797 * Argument specifies minwidth but not maxwidth
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3798 * (maxwidth can be specified by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3799 * (<negative-number> . <stuff>) modeline elements)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3800 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3801 while (isdigit (*this))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3802 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3803 spec_width = spec_width * 10 + (*this - '0');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3804 this++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3805 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3806 spec_width += pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3808 if (*this == 'M')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3809 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3810 pos = generate_fstring_runes (w, data, pos, spec_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3811 max_pos, Vglobal_mode_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3812 depth, max_pixsize, findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3813 type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3814 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3815 else if (*this == '-')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3816 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3817 Charcount num_to_add;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3818
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3819 if (max_pixsize < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3820 num_to_add = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3821 else if (max_pos != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3822 num_to_add = max_pos - pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3823 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3824 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3825 int cur_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3826 int dash_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3827 Bufbyte ch = '-';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3828 SET_CURRENT_MODE_CHARS_PIXSIZE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3830 dash_pixsize =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3831 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3832 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3834 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3835 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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3838 while (num_to_add--)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3839 pos = add_string_to_fstring_db_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3840 (data, (CONST Bufbyte *) "-", pos, pos, max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3841 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3842 else if (*this != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3843 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3844 Bufbyte *str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3845 Emchar ch = charptr_emchar (this);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3846 decode_mode_spec (w, ch, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3847
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3848 str = Dynarr_atp (mode_spec_bufbyte_string, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3849 pos = add_string_to_fstring_db_runes (data,str, pos, pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3850 max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3851 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3852
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3853 /* NOT this++. There could be any sort of character at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3854 the current position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3855 INC_CHARPTR (this);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3856 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3858 if (max_pixsize > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3859 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3860 int cur_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3861 SET_CURRENT_MODE_CHARS_PIXSIZE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3862
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3863 if (cur_pixsize >= max_pixsize)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3864 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3865 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3866 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3867 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3868 else if (SYMBOLP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3869 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3870 /* A symbol: process the value of the symbol recursively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3871 as if it appeared here directly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3872 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3873
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3874 if (!UNBOUNDP (tem))
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 value is a string, output that string literally:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3877 don't check for % within it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3878 if (STRINGP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3879 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3880 pos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3881 add_string_to_fstring_db_runes
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
3882 (data, XSTRING_DATA (tem), pos, min_pos, max_pos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3883 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3884 /* Give up right away for nil or t. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3885 else if (!EQ (tem, elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3886 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3887 elt = tem;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3888 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3889 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3890 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3891 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3892 else if (CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3893 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3894 /* A cons cell: four distinct cases.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3895 * If first element is a string or a cons, process all the elements
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3896 * and effectively concatenate them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3897 * If first element is a negative number, truncate displaying cdr to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3898 * at most that many characters. If positive, pad (with spaces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3899 * to at least that many characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3900 * If first element is a symbol, process the cadr or caddr recursively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3901 * according to whether the symbol's value is non-nil or nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3902 * If first element is a face, process the cdr recursively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3903 * without altering the depth.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3904 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3905 Lisp_Object car, tem;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3906
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3907 car = XCAR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3908 if (SYMBOLP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3909 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3910 elt = XCDR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3911 if (!CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3912 goto invalid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3913 tem = symbol_value_in_buffer (car, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3914 /* elt is now the cdr, and we know it is a cons cell.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3915 Use its car if CAR has a non-nil value. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3916 if (!UNBOUNDP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3917 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3918 if (!NILP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3919 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3920 elt = XCAR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3921 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3922 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3923 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3924 /* Symbol's value is nil (or symbol is unbound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3925 * Get the cddr of the original list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3926 * and if possible find the caddr and use that.
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 (NILP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3930 ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3931 else if (!CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3932 goto invalid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3933 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3934 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3935 elt = XCAR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3936 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3937 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3938 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3939 else if (INTP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3940 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3941 Charcount lim = XINT (car);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3942
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3943 elt = XCDR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3944
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3945 if (lim < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3946 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3947 /* Negative int means reduce maximum width.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3948 * DO NOT change MIN_PIXPOS here!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3949 * (20 -10 . foo) should truncate foo to 10 col
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3950 * and then pad to 20.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3951 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3952 if (max_pos == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3953 max_pos = pos - lim;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3954 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3955 max_pos = min (max_pos, pos - lim);
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 (lim > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3958 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3959 /* Padding specified. Don't let it be more than
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3960 * current maximum.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3961 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3962 lim += pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3963 if (max_pos != -1 && lim > max_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3964 lim = max_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3965 /* If that's more padding than already wanted, queue it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3966 * But don't reduce padding already specified even if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3967 * that is beyond the current truncation point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3968 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3969 if (lim > min_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3970 min_pos = lim;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3971 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3972 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3973 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3974 else if (STRINGP (car) || CONSP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3975 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3976 int limit = 50;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3977 /* LIMIT is to protect against circular lists. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3978 while (CONSP (elt) && --limit > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3979 && (pos < max_pos || max_pos == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3980 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3981 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3982 XCAR (elt), depth,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3983 max_pixsize, findex, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3984 elt = XCDR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3985 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3986 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3987 else if (EXTENTP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3988 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3989 struct extent *ext = XEXTENT (car);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3990
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3991 if (EXTENT_LIVE_P (ext))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3992 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3993 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3994 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3995 Lisp_Object font_inst;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3996 face_index new_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3997 Bytecount start = data->bytepos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3998
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3999 face = extent_face (ext);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4000 if (FACEP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4001 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4002 /* #### needs to merge faces, sigh */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4003 /* #### needs to handle list of faces */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4004 new_findex = get_builtin_face_cache_index (w, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4005 /* !!#### not right; needs to compute the max height of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4006 all the charsets */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4007 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4008 Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4009
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4010 data->dl->ascent = max (data->dl->ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4011 XFONT_INSTANCE (font_inst)->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4012 data->dl->descent = max (data->dl->descent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4013 XFONT_INSTANCE (font_inst)->
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4014 descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4015 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4016 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4017 new_findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4019 data->findex = new_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4020 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4021 XCDR (elt), depth - 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4022 max_pixsize, new_findex, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4023 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4024 Dynarr_add (formatted_string_extent_dynarr, ext);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4025 Dynarr_add (formatted_string_extent_start_dynarr, start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4026 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4027 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4028 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4029 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4030 else if (GLYPHP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4031 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4032 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos);
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 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4036 invalid:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4037 pos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4038 add_string_to_fstring_db_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4039 (data, (CONST Bufbyte *) GETTEXT ("*invalid*"), pos, min_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4040 max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4041 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4042
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4043 if (min_pos > pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4044 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4045 add_string_to_fstring_db_runes (data, (CONST Bufbyte *) "", pos, min_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4046 -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4047 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4049 return pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4050 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4051
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4052 /* The caller is responsible for freeing the returned string. */
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4053 Bufbyte *
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4054 generate_formatted_string (struct window *w, Lisp_Object format_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4055 Lisp_Object result_str, face_index findex, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4056 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4057 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4058 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4059 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4060
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4061 dl = &formatted_string_display_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4062 db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4063 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4064
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4065 generate_formatted_string_db (format_str, result_str, w, dl, db, findex, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4066 -1, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4067
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4068 Dynarr_reset (formatted_string_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4069 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4070 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4071 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4072 Dynarr_add (formatted_string_emchar_dynarr,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4073 Dynarr_atp (db->runes, elt)->object.chr.ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4074 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4075 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4076
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4077 return
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4078 convert_emchar_string_into_malloced_string
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4079 ( Dynarr_atp (formatted_string_emchar_dynarr, 0),
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4080 Dynarr_length (formatted_string_emchar_dynarr), 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4081 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4082
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4083 /* Update just the modeline. Assumes the desired display structs. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4084 they do not have a modeline block, it does nothing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4085 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4086 regenerate_modeline (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4087 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4088 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4090 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4091 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4092 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4093 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4094 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4095 redisplay_update_line (w, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4096 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4097 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4099 /* Make sure that modeline display line is present in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4100 display structs if the window has a modeline and update that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4101 line. Returns true if a modeline was needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4102 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4103 ensure_modeline_generated (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4104 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4105 int need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4107 /* minibuffer windows don't have modelines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4108 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4109 need_modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4110 /* windows which haven't had it turned off do */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4111 else if (WINDOW_HAS_MODELINE_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4112 need_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4113 /* 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
4114 a horizontal scrollbar */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4115 else if (window_scrollbar_height (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4116 need_modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4117 /* and in this case there is none */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4118 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4119 need_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4120
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4121 if (need_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4122 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4123 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4125 dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4126
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4127 /* We don't care if there is a display line which is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4128 currently a modeline because it is definitely going to become
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4129 one if we have gotten to this point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4130 if (Dynarr_length (dla) == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4131 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4132 if (Dynarr_largest (dla) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4133 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4134 struct display_line *mlp = Dynarr_atp (dla, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4135 Dynarr_add (dla, *mlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4136 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4137 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4138 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4139 struct display_line modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4140 memset (&modeline, 0, sizeof (struct display_line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4141 Dynarr_add (dla, modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4142 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4143 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4145 /* If we're adding a new place marker go ahead and generate the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4146 modeline so that it is available for use by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4147 window_modeline_height. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4148 generate_modeline (w, Dynarr_atp (dla, 0), type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4149 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4151 return need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4152 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4154 /* #### Kludge or not a kludge. I tend towards the former. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4155 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4156 real_current_modeline_height (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4157 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4158 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
4159 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4160
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4161 if (ensure_modeline_generated (w, CMOTION_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4162 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4163 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4164
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4165 dla = window_display_lines (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4167 if (Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4168 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4169 if (Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4170 return (Dynarr_atp (dla, 0)->ascent +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4171 Dynarr_atp (dla, 0)->descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4172 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4173 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4174 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4175 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4176 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4177 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4178 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4179 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4180 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4182
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4183 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4184 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4185 /* window-regeneration routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4186 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4187 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4188
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4189 /* For a given window and starting position in the buffer it contains,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4190 ensure that the TYPE display lines accurately represent the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4191 presentation of the window. We pass the buffer instead of getting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4192 it from the window since redisplay_window may have temporarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4193 changed it to the echo area buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4195 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4196 regenerate_window (struct window *w, Bufpos start_pos, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4197 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4198 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4199 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4200 int ypos = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4201 int yend; /* set farther down */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4202
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4203 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4204 layout_bounds bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4205 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4206 int need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4208 /* The lines had better exist by this point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4209 if (!(dla = window_display_lines (w, type)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4210 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4211 Dynarr_reset (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4212 w->max_line_len = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4213
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4214 /* Normally these get updated in redisplay_window but it is possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4215 for this function to get called from some other points where that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4216 update may not have occurred. This acts as a safety check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4217 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4218 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4219 if (!Dynarr_length (w->glyph_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4220 reset_glyph_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4222 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4223 Fset_marker (w->pointm[type], make_int (point), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4224 w->last_point_x[type] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4225 w->last_point_y[type] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4226
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4227 /* Make sure a modeline is in the structs if needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4228 need_modeline = ensure_modeline_generated (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4230 /* Wait until here to set this so that the structs have a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4231 generated in the case where one didn't exist. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4232 yend = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4234 bounds = calculate_display_line_boundaries (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4235
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4236 /* 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
4237 if (MINI_WINDOW_P (w)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4238 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4239 && !echo_area_active (f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4240 && start_pos == BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4241 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4242 struct prop_block pb;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4243 Lisp_Object string;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4244 prop = Dynarr_new (struct prop_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4245
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4246 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4247 pb.type = PROP_MINIBUF_PROMPT;
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4248 pb.data.p_string.str = XSTRING_DATA(string);
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4249 pb.data.p_string.len = XSTRING_LENGTH(string);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4250 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4251 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4252 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4253 prop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4254
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4255 while (ypos < yend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4256 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4257 struct display_line dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4258 struct display_line *dlp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4259 int local;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4260
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4261 if (Dynarr_length (dla) < Dynarr_largest (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4262 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4263 dlp = Dynarr_atp (dla, Dynarr_length (dla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4264 local = 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 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4267 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4268 dlp = &dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4269 memset (dlp, 0, sizeof (struct display_line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4270 local = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4271 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4272
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4273 dlp->bounds = bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4274 dlp->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4275 start_pos = generate_display_line (w, dlp, 1, start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4276 w->hscroll, &prop, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4277 dlp->ypos = ypos + dlp->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4278 ypos = dlp->ypos + dlp->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4280 if (ypos > yend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4281 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4282 int visible_height = dlp->ascent + dlp->descent;
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->clip = (ypos - yend);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4285 visible_height -= dlp->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4286
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4287 if (visible_height < VERTICAL_CLIP (w, 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4288 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4289 if (local)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4290 free_display_line (dlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4291 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4292 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4293 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4294 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4295 dlp->clip = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4297 if (dlp->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4298 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4299 /* #### This check is steaming crap. Have to get things
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4300 fixed so when create_text_block hits EOB, we're done,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4301 period. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4302 if (w->last_point_x[type] == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4303 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4304 w->last_point_x[type] = dlp->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4305 w->last_point_y[type] = Dynarr_length (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4306 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4307 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4308 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4309 /* #### This means that we've added a cursor at EOB
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4310 twice. Yuck oh yuck. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4311 struct display_block *db =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4312 get_display_block_from_line (dlp, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4314 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4315 dlp->cursor_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4316 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4317 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4319 if (dlp->num_chars > w->max_line_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4320 w->max_line_len = dlp->num_chars;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4321
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4322 Dynarr_add (dla, *dlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4323
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4324 /* #### This isn't right, but it is close enough for now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4325 w->window_end_pos[type] = start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4327 /* #### This type of check needs to be done down in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4328 generate_display_line call. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4329 if (start_pos > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4330 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4331 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4333 if (prop)
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
4334 Dynarr_free (prop);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4336 /* #### More not quite right, but close enough. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4337 /* #### Ben sez: apparently window_end_pos[] is measured
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4338 as the number of characters between the window end and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4339 end of the buffer? This seems rather weirdo. What's
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4340 the justification for this? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4341 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4343 if (need_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4344 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4345 /* 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
4346 there when we first started working in this function. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4347 generate_modeline (w, Dynarr_atp (dla, 0), type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4348 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4349 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4351 #define REGEN_INC_FIND_START_END \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4352 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4353 /* Determine start and end of lines. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4354 if (!Dynarr_length (cdla)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4355 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4356 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4357 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4358 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4359 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4360 dla_start = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4361 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4362 else if (!Dynarr_atp (cdla, 0)->modeline \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4363 && !Dynarr_atp (ddla, 0)->modeline) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4364 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4365 dla_start = 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4366 } \
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 abort (); /* structs differ */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4369 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4370 dla_end = Dynarr_length (cdla) - 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4371 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4372 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4373 start_pos = (Dynarr_atp (cdla, dla_start)->bufpos \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4374 + Dynarr_atp (cdla, dla_start)->offset); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4375 /* 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
4376 full regen. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4377 if (startp != start_pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4378 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4379 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4380 /* Point is outside the visible region so give up. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4381 if (pointm < start_pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4382 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4383 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4384 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4385
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4386 /* This attempts to incrementally update the display structures. It
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4387 returns a boolean indicating success or failure. This function is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4388 very similar to regenerate_window_incrementally and is in fact only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4389 called from that function. However, because of the nature of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4390 changes it deals with it sometimes makes different assumptions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4391 which can lead to success which are much more difficult to make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4392 when dealing with buffer changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4393
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4394 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4395 regenerate_window_extents_only_changed (struct window *w, Bufpos startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4396 Bufpos pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4397 Charcount beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4398 Charcount end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4399 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4400 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4401 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4402 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4404 int dla_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4405 int dla_end, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4406 int first_line, last_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4407 Bufpos start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4408 /* Don't define this in the loop where it is used because we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4409 definitely want its value to survive between passes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4410 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4412 /* 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
4413 been incremented, then fail. I'm not sure of the exact circumstances
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4414 under which this can happen, but I believe that it is probably a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4415 reasonable happening. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4416 if (!point_visible (w, pointm, CURRENT_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4417 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4418 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4419
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4420 /* 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
4421 go ahead and proceed with the optimization attempt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4422 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4423 || pointm != marker_position (w->last_point[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4424 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4425 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4426 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4427 struct frame *sel_f = device_selected_frame (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4428 int success = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4430 if (w->last_point_x[CURRENT_DISP] != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4431 && w->last_point_y[CURRENT_DISP] != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4432 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4433
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4434 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4435 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4436 /* Always regenerate the modeline in case it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4437 displaying the current line or column. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4438 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4439 success = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4440 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4441 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4442 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4443 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4444 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4445 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4446 success = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4447 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4449 if (!success)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4450 return 0;
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 if (beg_unchanged == -1 && end_unchanged == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4454 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4455
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4456 /* assert: There are no buffer modifications or they are all below the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4457 visible region. We assume that regenerate_window_incrementally has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4458 not called us unless this is true. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4460 REGEN_INC_FIND_START_END;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4462 /* If the changed are starts before the visible area, give up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4463 if (beg_unchanged < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4464 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4466 /* Find what display line the extent changes first affect. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4467 line = dla_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4468 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4469 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4470 struct display_line *dl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4471 Bufpos lstart = dl->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4472 Bufpos lend = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4474 if (beg_unchanged >= lstart && beg_unchanged <= lend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4475 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4477 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4478 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4479
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4480 /* If the changes are below the visible area then if point hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4481 moved return success otherwise fail in order to be safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4482 if (line > dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4483 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4484 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4485 && pointm == marker_position (w->last_point[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4486 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4487 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4488 return 0;
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 /* At this point we know what line the changes first affect. We now
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4492 begin redrawing lines as long as we are still in the affected
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4493 region and the line's size and positioning don't change.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4494 Otherwise we fail. If we fail we will have altered the desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4495 structs which could lead to an assertion failure. However, if we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4496 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
4497 will actually end up being safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4498 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4499 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4500 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4501 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4502
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4503 first_line = last_line = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4504 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4505 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4506 Bufpos old_start, old_end, new_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4507 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4508 struct display_line *ddl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4509 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4510 int initial_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4512 assert (cdl->bufpos == ddl->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4513 assert (cdl->end_bufpos == ddl->end_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4514 assert (cdl->offset == ddl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4516 db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4517 initial_size = Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4518 old_start = ddl->bufpos + ddl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4519 old_end = ddl->end_bufpos + ddl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4521 /* If this is the first line being updated and it used
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4522 propagation data, fail. Otherwise we'll be okay because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4523 we'll have the necessary propagation data. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4524 if (line == first_line && ddl->used_prop_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4525 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4526
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4527 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4528 w->hscroll, &prop, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4529 ddl->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4530
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4531 /* #### If there is propagated stuff the fail. We could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4532 probably actually deal with this if the line had propagated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4533 information when originally created by a full
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4534 regeneration. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4535 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4536 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4537 Dynarr_free (prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4538 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4539 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4540
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4541 /* If any line position parameters have changed or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4542 cursor has disappeared or disappeared, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4543 db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4544 if (cdl->ypos != ddl->ypos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4545 || cdl->ascent != ddl->ascent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4546 || cdl->descent != ddl->descent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4547 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4548 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4549 || old_start != ddl->bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4550 || old_end != ddl->end_bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4551 || initial_size != Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4552 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4553 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4554 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4555
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4556 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4557 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4558 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4559 w->last_point_y[DESIRED_DISP] = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4560 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4561
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4562 last_line = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4564 /* If the extent changes end on the line we just updated then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4565 we're done. Otherwise go on to the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4566 if (end_unchanged <= ddl->end_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4567 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4568 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4569 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4570 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4571
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4572 redisplay_update_line (w, first_line, last_line, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4573 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4574 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4575
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4576 /* Attempt to update the display data structures based on knowledge of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4577 the changed region in the buffer. Returns a boolean indicating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4578 success or failure. If this function returns a failure then a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4579 regenerate_window _must_ be performed next in order to maintain
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4580 invariants located here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4581
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4582 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4583 regenerate_window_incrementally (struct window *w, Bufpos startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4584 Bufpos pointm)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4585 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4586 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4587 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4588 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4589 Charcount beg_unchanged, end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4590 Charcount extent_beg_unchanged, extent_end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4592 int dla_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4593 int dla_end, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4594 Bufpos start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4595
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4596 /* If this function is called, the current and desired structures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4597 had better be identical. If they are not, then that is a bug. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4598 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4599
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4600 /* We don't handle minibuffer windows yet. The minibuffer prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4601 screws us up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4602 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4603 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4604
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4605 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4606 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4607 ? -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4608 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4610 /* If nothing has changed in the buffer, then make sure point is ok
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4611 and succeed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4612 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4613 return regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4614 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4615 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4617 /* We can't deal with deleted newlines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4618 if (BUF_NEWLINE_WAS_DELETED (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4619 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4620
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4621 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4622 end_unchanged = (BUF_END_UNCHANGED (b) == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4623 ? -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4624 : BUF_Z (b) - BUF_END_UNCHANGED (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4625
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4626 REGEN_INC_FIND_START_END;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4628 /* If the changed area starts before the visible area, give up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4629 if (beg_unchanged < startp)
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 /* Find what display line the buffer changes first affect. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4633 line = dla_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4634 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4635 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4636 struct display_line *dl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4637 Bufpos lstart = dl->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4638 Bufpos lend = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4639
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4640 if (beg_unchanged >= lstart && beg_unchanged <= lend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4641 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4642
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4643 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4644 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4645
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4646 /* If the changes are below the visible area then if point hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4647 moved return success otherwise fail in order to be safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4648 if (line > dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4649 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4650 return regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4651 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4652 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4653 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4654 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4655 /* At this point we know what line the changes first affect. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4656 now redraw that line. If the changes are contained within it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4657 we are going to succeed and can update just that one line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4658 Otherwise we fail. If we fail we will have altered the desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4659 structs which could lead to an assertion failure. However, if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4660 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
4661 so we will actually end up being safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4662 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4663 Bufpos new_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4664 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4665 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4666 struct display_line *ddl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4667
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4668 assert (cdl->bufpos == ddl->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4669 assert (cdl->end_bufpos == ddl->end_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4670 assert (cdl->offset == ddl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4672 /* If the last rune is already a continuation glyph, fail.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4673 #### We should be able to handle this better. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4674 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4675 struct display_block *db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4676 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4677 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4678 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4679 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4680
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4681 if (rb->type == RUNE_DGLYPH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4682 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4683 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4684 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4685 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4687 /* If the line was generated using propagation data, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4688 if (ddl->used_prop_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4689 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4690
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4691 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4692 w->hscroll, &prop, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4693 ddl->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4694
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4695 /* If there is propagated stuff then it is pretty much a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4696 guarantee that more than just the one line is affected. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4697 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4698 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4699 Dynarr_free (prop);
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4703 /* If the last rune is now a continuation glyph, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4704 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4705 struct display_block *db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4706 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4707 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4708 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4709 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4710
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4711 if (rb->type == RUNE_DGLYPH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4712 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4713 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4714 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4715 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4716
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4717 /* If any line position parameters have changed or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4718 cursor has disappeared or disappeared, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4719 if (cdl->ypos != ddl->ypos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4720 || cdl->ascent != ddl->ascent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4721 || cdl->descent != ddl->descent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4722 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4723 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4724 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4725 return 0;
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 the changed area also ends on this line, then we may be in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4729 business. Update everything and return success. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4730 if (end_unchanged >= ddl->bufpos && end_unchanged <= ddl->end_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4731 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4732 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4733 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4734 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4735 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4736 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4737 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4738
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4739 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4740 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4741 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4742 w->last_point_y[DESIRED_DISP] = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4743 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4745 redisplay_update_line (w, line, line, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4746 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4748 /* #### For now we just flush the cache until this has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4749 tested. After that is done, this should correct the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4750 cache directly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4751 Dynarr_reset (w->line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4752
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4753 /* Adjust the extent changed boundaries to remove any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4754 overlap with the buffer changes since we've just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4755 successfully updated that area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4756 if (extent_beg_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4757 && extent_beg_unchanged >= beg_unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4758 && extent_beg_unchanged < end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4759 extent_beg_unchanged = end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4760
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4761 if (extent_end_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4762 && extent_end_unchanged >= beg_unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4763 && extent_end_unchanged < end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4764 extent_end_unchanged = beg_unchanged - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4765
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4766 if (extent_end_unchanged <= extent_beg_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4767 extent_beg_unchanged = extent_end_unchanged = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4768
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4769 /* This could lead to odd results if it fails, but since the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4770 buffer changes update succeeded this probably will to.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4771 We already know that the extent changes start at or after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4772 the line because we checked before entering the loop. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4773 if (extent_beg_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4774 && extent_end_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4775 && ((extent_beg_unchanged < ddl->bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4776 || (extent_end_unchanged > ddl->end_bufpos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4777 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4778 return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4779 regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4780 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4781 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4782 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4783 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4784 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4785 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4786 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4788 /* Oh, well. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4789 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4790 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4791
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4792 /* Given a window and a point, update the given display lines such
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
4793 that point is displayed in the middle of the window. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
4794
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
4795 static void
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4796 regenerate_window_point_center (struct window *w, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4797 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4798 Bufpos startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4799
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4800 /* We need to make sure that the modeline is generated so that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4801 window height can be calculated correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4802 ensure_modeline_generated (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4803
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4804 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4805 regenerate_window (w, startp, point, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4806 Fset_marker (w->start[type], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4807
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
4808 return;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4809 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4810
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4811 /* Given a window and a set of display lines, return a boolean
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4812 indicating whether the given point is contained within. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4814 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4815 point_visible (struct window *w, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4816 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4817 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4818 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4819 int first_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4820
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4821 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4822 first_line = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4823 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4824 first_line = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4825
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4826 if (Dynarr_length (dla) > first_line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4827 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4828 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4829 struct display_line *dl = Dynarr_atp (dla, first_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4830
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4831 start = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4832 end = BUF_Z (b) - w->window_end_pos[type] - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4834 if (point >= start && point <= end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4835 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4836 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4837 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4838 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4839
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4840 if (point >= (dl->bufpos + dl->offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4841 && point <= (dl->end_bufpos + dl->offset))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4842 return (!dl->clip);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4843 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4844 return 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 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4847 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4848 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4849 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4850 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4851 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4852 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4853 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4854 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4856 /* Return pixel position the middle of the window, not including the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4857 modeline and any potential horizontal scrollbar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4858
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4859 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4860 window_half_pixpos (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4861 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4862 return (WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4863 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4864
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4865 /* Return the display line which is currently in the middle of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4866 window W for display lines TYPE. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4867
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4868 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4869 line_at_center (struct window *w, int type, Bufpos start, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4870 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4871 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4872 int half;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4873 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4874 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4876 if (type == CMOTION_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4877 regenerate_window (w, start, point, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4878
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4879 dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4880 half = window_half_pixpos (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4881
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4882 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4883 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4884 struct display_line *dl = Dynarr_atp (dla, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4885 int line_bot = dl->ypos + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4887 if (line_bot > half)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4888 return elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4889 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4890
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4891 /* 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
4892 being displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4893 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4894 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4895
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4896 /* Return a value for point that would place it at the beginning of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4897 the line which is in the middle of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4898
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4899 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4900 point_at_center (struct window *w, int type, Bufpos start, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4901 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4902 /* line_at_center will regenerate the display structures, if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4903 int line = line_at_center (w, type, start, point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4904
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4905 if (line == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4906 return BUF_ZV (XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4907 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4908 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4909 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4910 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4911
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4912 return dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4913 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4914 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4915
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4916 /* For a given window, ensure that the current visual representation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4917 is accurate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4918
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4919 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4920 redisplay_window (Lisp_Object window, int skip_selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4921 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4922 struct window *w = XWINDOW (window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4923 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4924 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4925 Lisp_Object old_buffer = w->buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4926 struct buffer *b;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4927 int echo_active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4928 int startp = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4929 int pointm;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
4930 int selected;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4931 int skip_output = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4932 int truncation_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4933 int inactive_minibuffer =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4934 (MINI_WINDOW_P (w) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4935 (f != device_selected_frame (d)) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4936 !is_surrogate_for_selected_frame (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4937
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4938 /* #### In the new world this function actually does a bunch of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4939 optimizations such as buffer-based scrolling, but none of that is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4940 implemented yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4941
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4942 /* If this is a combination window, do its children; that's all.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4943 The selected window is always a leaf so we don't check for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4944 skip_selected here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4945 if (!NILP (w->vchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4946 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4947 redisplay_windows (w->vchild, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4948 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4949 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4950 if (!NILP (w->hchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4951 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4952 redisplay_windows (w->hchild, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4953 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4954 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4955
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4956 /* Is this window the selected window on its frame? */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
4957 selected =
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
4958 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
4959 if (skip_selected && selected)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4960 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4962 /* It is possible that the window is not fully initialized yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4963 if (NILP (w->buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4964 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4965
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4966 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4967 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4968 w->buffer = Vecho_area_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4969 echo_active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4970 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4971
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4972 b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4973
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4974 if (echo_active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4975 pointm = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4976 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4977 {
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
4978 if (selected)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4979 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4980 pointm = BUF_PT (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4981 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4982 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4983 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4984 pointm = marker_position (w->pointm[CURRENT_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4986 if (pointm < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4987 pointm = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4988 else if (pointm > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4989 pointm = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4990 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4991 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4992 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), old_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4993
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4994 /* If the buffer has changed we have to invalid all of our face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4995 cache elements. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4996 if ((!echo_active && b != window_display_buffer (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4997 || !Dynarr_length (w->face_cachels)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4998 || f->faces_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4999 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5000 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5001 mark_face_cachels_as_not_updated (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5002
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5003 /* Ditto the glyph cache elements. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5004 if ((!echo_active && b != window_display_buffer (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5005 || !Dynarr_length (w->glyph_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5006 reset_glyph_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5007 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5008 mark_glyph_cachels_as_not_updated (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5009
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5010 /* If the marker's buffer is not the window's buffer, then we need
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5011 to find a new starting position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5012 if (!MINI_WINDOW_P (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5013 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5014 {
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5015 regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5016
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5017 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5018 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5020 if (echo_active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5021 startp = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5022 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5023 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5024 startp = marker_position (w->start[CURRENT_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5025 if (startp < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5026 startp = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5027 else if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5028 startp = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5029 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5030 Fset_marker (w->start[DESIRED_DISP], make_int (startp), old_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5032 truncation_changed = (find_window_mirror (w)->truncate_win !=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5033 window_truncation_on (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5034
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5035 /* 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
5036 should display from there and change point, if necessary, to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5037 ensure that it is visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5038 if (w->force_start || inactive_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5039 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5040 w->force_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5041 w->last_modified[DESIRED_DISP] = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5042 w->last_facechange[DESIRED_DISP] = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5043
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5044 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5045
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5046 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5047 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5048 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5049
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5050 if (selected)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5051 BUF_SET_PT (b, pointm);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5052
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5053 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5054 old_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5055
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5056 /* #### BUFU amounts of overkil just to get the cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5057 location marked properly. FIX ME FIX ME FIX ME */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5058 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5059 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5060
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5061 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5062 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5063
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5064 /* If nothing has changed since the last redisplay, then we just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5065 need to make sure that point is still visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5066 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5067 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5068 && pointm >= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5069 /* This check is to make sure we restore the minibuffer after a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5070 temporary change to the echo area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5071 && !(MINI_WINDOW_P (w) && f->buffers_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5072 && !f->frame_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5073 && !truncation_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5074 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5075 /* Check if the cursor has actually moved. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5076 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5077 && pointm == marker_position (w->last_point[CURRENT_DISP])
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5078 && selected
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5079 && !w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5080 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5081 && !f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5082 && !f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5083 && !f->point_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5084 && !f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5085 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5086 /* If not, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5087 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5088 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5090 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5091 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5092 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5093 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5094 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5095 /* If the new point is visible in the redisplay structures,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5096 then let the output update routines handle it, otherwise
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5097 do things the hard way. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5098 if (!w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5099 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5100 && !f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5101 && !f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5102 && !f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5103 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5104 if (point_visible (w, pointm, CURRENT_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5105 && w->last_point_x[CURRENT_DISP] != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5106 && w->last_point_y[CURRENT_DISP] != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5107 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5108 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5109 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5110 /* Always regenerate in case it is displaying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5111 the current line or column. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5112 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5113
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5114 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5115 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5116 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5117 }
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5118 else if (!selected && !f->point_changed)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5119 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5120 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5121 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5122
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5123 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5124 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5125 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5126 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5127
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5128 /* If we weren't able to take the shortcut method, then use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5129 the brute force method. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5130 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5132 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5133 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5134 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5135 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5136
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5137 /* Check if the starting point is no longer at the beginning of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5138 line, in which case find a new starting point. We also recenter
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5139 if our start position is equal to point-max. Otherwise we'll end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5140 up with a blank window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5141 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5142 && !(startp == BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5143 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5144 || (pointm == startp &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5145 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5146 startp < marker_position (w->last_start[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5147 || (startp == BUF_ZV (b)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5148 {
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5149 regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5151 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5152 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5153 /* See if we can update the data structures locally based on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5154 knowledge of what changed in the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5155 else if (!w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5156 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5157 && !f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5158 && !f->windows_structure_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5159 && !f->frame_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5160 && !truncation_changed
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 && regenerate_window_incrementally (w, startp, pointm))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5163 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5164 if (f->modeline_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5165 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5166 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5167 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5168
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5169 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5170 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5171 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5172 /* #### This is where a check for structure based scrolling would go. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5173 /* If all else fails, try just regenerating and see what happens. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5174 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5175 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5176 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5177
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5178 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5179 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5180 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5181
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5182 /* We still haven't gotten the window regenerated with point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5183 visible. Next we try scrolling a little and see if point comes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5184 back onto the screen. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5185 if (scroll_step)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5186 {
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5187 Bufpos bufpos;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5188
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5189 bufpos = vmotion (w, startp,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5190 (pointm < startp) ? -scroll_step : scroll_step, 0);
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5191 regenerate_window (w, bufpos, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5193 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5194 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5195 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5196
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5197 /* We still haven't managed to get the screen drawn with point on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5198 the screen, so just center it and be done with it. */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5199 regenerate_window_point_center (w, pointm, DESIRED_DISP);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5201
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5202 regeneration_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5204 /* If the window's frame is changed then reset the current display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5205 lines in order to force a full repaint. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5206 if (f->frame_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5207 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5208 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5209
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5210 Dynarr_reset (cla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5211 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5212
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5213 /* Must do this before calling redisplay_output_window because it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5214 sets some markers on the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5215 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5216 w->buffer = old_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5218 /* These also have to be set before calling redisplay_output_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5219 since it sets the CURRENT_DISP values based on them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5220 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5221 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5222 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5223 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5225 if (!skip_output)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5226 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5227 Bufpos start = marker_position (w->start[DESIRED_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5228 Bufpos end = (w->window_end_pos[DESIRED_DISP] == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5229 ? BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5230 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5232 update_line_start_cache (w, start, end, pointm, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5233 redisplay_output_window (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5234 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5235
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5236 /* #### This should be dependent on face changes and will need to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5237 somewhere else once tty updates occur on a per-frame basis. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5238 mark_face_cachels_as_clean (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5239
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5240 w->windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5241 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5242
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5243 /* Call buffer_reset_changes for all buffers present in any window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5244 currently visible in all frames on all devices. #### There has to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5245 be a better way to do this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5247 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5248 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5249 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5250 buffer_reset_changes (XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5251 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5252 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5253
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5254 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5255 reset_buffer_changes (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5256 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5257 Lisp_Object frmcons, devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5259 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5260 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5261 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5262
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5263 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5264 map_windows (f, reset_buffer_changes_mapfun, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5265 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5266 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5267
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5268 /* Ensure that all windows underneath the given window in the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5269 hierarchy are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5270
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5271 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5272 redisplay_windows (Lisp_Object window, int skip_selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5273 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5274 for (; !NILP (window) ; window = XWINDOW (window)->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5275 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5276 redisplay_window (window, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5277 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5278 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5280 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5281 call_redisplay_end_triggers (struct window *w, void *closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5282 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5283 Bufpos lrpos = w->last_redisplay_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5284 w->last_redisplay_pos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5285 if (!NILP (w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5286 && !NILP (w->redisplay_end_trigger)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5287 && lrpos > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5288 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5289 Bufpos pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5291 if (MARKERP (w->redisplay_end_trigger)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5292 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5293 pos = marker_position (w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5294 else if (INTP (w->redisplay_end_trigger))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5295 pos = XINT (w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5296 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5297 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5298 w->redisplay_end_trigger = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5299 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5300 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5301
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5302 if (lrpos >= pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5303 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5304 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5305 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5306 va_run_hook_with_args_in_buffer (XBUFFER (w->buffer),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5307 Qredisplay_end_trigger_functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5308 2, window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5309 w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5310 w->redisplay_end_trigger = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5311 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5312 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5314 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5315 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5317 /* Ensure that all windows on the given frame are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5319 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5320 redisplay_frame (struct frame *f, int preemption_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5321 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5322 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5323
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5324 if (preemption_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5325 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5326 /* The preemption check itself takes a lot of time,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5327 so normally don't do it here. We do it if called
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5328 from Lisp, though (`redisplay-frame'). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5329 int preempted;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5330
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5331 REDISPLAY_PREEMPTION_CHECK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5332 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5333 return 1;
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 /* Before we put a hold on frame size changes, attempt to process
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5337 any which are already pending. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5338 if (f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5339 change_frame_size (f, f->new_height, f->new_width, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5340
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5341 /* The menubar, toolbar, and icon updates must be done before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5342 hold_frame_size_changes is called and we are officially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5343 'in_display'. They may eval lisp code which may call Fsignal.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5344 If in_display is set Fsignal will abort. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5346 #ifdef HAVE_MENUBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5347 /* Update the menubar. It is done first since it could change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5348 the menubar's visibility. This way we avoid having flashing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5349 caused by an Expose event generated by the visibility change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5350 being handled. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5351 update_frame_menubars (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5352 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5354 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5355 /* Update the toolbars. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5356 update_frame_toolbars (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5357 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5358
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5359 hold_frame_size_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5360
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5361 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5362 /* Within this section, we are defenseless and assume that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5363 following cannot happen:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5364
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5365 1) garbage collection
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5366 2) Lisp code evaluation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5367 3) frame size changes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5369 We ensure (3) by calling hold_frame_size_changes(), which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5370 will cause any pending frame size changes to get put on hold
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5371 till after the end of the critical section. (1) follows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5372 automatically if (2) is met. #### Unfortunately, there are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5373 some places where Lisp code can be called within this section.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5374 We need to remove them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5376 If Fsignal() is called during this critical section, we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5377 will abort().
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5379 If garbage collection is called during this critical section,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5380 we simply return. #### We should abort instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5382 #### If a frame-size change does occur we should probably
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5383 actually be preempting redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5384
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5385 /* 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
5386 if (f->clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5387 f->frame_changed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5388
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5389 /* Erase the frame before outputting its contents. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5390 if (f->clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5391 DEVMETH (d, clear_frame, (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5392
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5393 /* Do the selected window first. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5394 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5395
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5396 /* Then do the rest. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5397 redisplay_windows (f->root_window, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5398
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5399 /* We now call the output_end routine for tty frames. We delay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5400 doing so in order to avoid cursor flicker. So much for 100%
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5401 encapsulation. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5402 if (FRAME_TTY_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5403 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5404
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5405 update_frame_title (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5407 f->buffers_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5408 f->clip_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5409 f->extents_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5410 f->faces_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5411 f->frame_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5412 f->icon_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5413 f->menubar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5414 f->modeline_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5415 f->point_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5416 f->toolbar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5417 f->windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5418 f->windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5419 f->window_face_cache_reset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5420
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5421 f->clear = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5423 if (!f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5424 f->size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5425
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5426 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5427
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5428 /* Allow frame size changes to occur again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5430 #### what happens if changes to other frames happen? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5431 unhold_one_frame_size_changes (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5432
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5433 map_windows (f, call_redisplay_end_triggers, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5434 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5435 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5436
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5437 /* Ensure that all frames on the given device are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5438
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5439 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5440 redisplay_device (struct device *d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5441 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5442 Lisp_Object frame, frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5443 int preempted = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5444 int size_change_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5445 struct frame *f;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5447 if (DEVICE_STREAM_P (d)) /* nothing to do */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5448 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5450 /* It is possible that redisplay has been called before the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5451 device is fully initialized. If so then continue with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5452 next device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5453 if (NILP (DEVICE_SELECTED_FRAME (d)))
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 REDISPLAY_PREEMPTION_CHECK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5457 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5458 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5460 /* Always do the selected frame first. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5461 frame = DEVICE_SELECTED_FRAME (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5463 f = XFRAME (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5464
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5465 if (f->icon_changed || f->windows_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5466 update_frame_icon (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5467
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5468 if (FRAME_REPAINT_P (f))
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 if (f->buffers_changed || f->clip_changed || f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5471 || f->faces_changed || f->frame_changed || f->menubar_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5472 || f->modeline_changed || f->point_changed || f->size_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5473 || f->toolbar_changed || f->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5474 || f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5475 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5476 preempted = redisplay_frame (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5477 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5479 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5480 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5481
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5482 /* If the frame redisplay did not get preempted, then this flag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5483 should have gotten set to 0. It might be possible for that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5484 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
5485 time. To make sure we don't miss anything we simply don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5486 reset the top level flags until the condition ends up being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5487 in the right state. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5488 if (f->size_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5489 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5490 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5491
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5492 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5493 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5494 f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5495
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5496 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5497 continue;
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 (f->icon_changed || f->windows_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5500 update_frame_icon (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5501
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
5502 if (FRAME_REPAINT_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5503 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5504 if (f->buffers_changed || f->clip_changed || f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5505 || f->faces_changed || f->frame_changed || f->menubar_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5506 || f->modeline_changed || f->point_changed || f->size_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5507 || f->toolbar_changed || f->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5508 || f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5509 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5510 preempted = redisplay_frame (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5511 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5512
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5513 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5514 return 1;
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->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5517 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5518 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5519 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5521 /* If we get here then we redisplayed all of our frames without
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5522 getting preempted so mark ourselves as clean. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5523 d->buffers_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5524 d->clip_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5525 d->extents_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5526 d->faces_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5527 d->frame_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5528 d->icon_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5529 d->menubar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5530 d->modeline_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5531 d->point_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5532 d->toolbar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5533 d->windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5534 d->windows_structure_changed = 0;
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 (!size_change_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5537 d->size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5538
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5539 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5540 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5541
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
5542 #ifndef WINDOWSNT
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5543 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5544 restore_profiling_redisplay_flag (Lisp_Object val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5545 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5546 profiling_redisplay_flag = XINT (val);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5547 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5548 }
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
5549 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5550
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5551 /* Ensure that all windows on all frames on all devices are displaying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5552 the current contents of their respective buffers. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5554 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5555 redisplay_without_hooks (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5556 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5557 Lisp_Object devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5558 int size_change_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5559 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5560
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
5561 #ifndef WINDOWSNT
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5562 if (profiling_active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5563 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5564 record_unwind_protect (restore_profiling_redisplay_flag,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5565 make_int (profiling_redisplay_flag));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5566 profiling_redisplay_flag = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5567 }
100
4be1180a9e89 Import from CVS: tag r20-1b2
cvs
parents: 94
diff changeset
5568 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5569
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5570 if (asynch_device_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5571 handle_asynch_device_change ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5573 if (!buffers_changed && !clip_changed && !extents_changed && !faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5574 && !frame_changed && !icon_changed && !menubar_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5575 && !modeline_changed && !point_changed && !size_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5576 && !toolbar_changed && !windows_changed && !windows_structure_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5577 && !disable_preemption && preemption_count < max_preempts)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5578 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5579
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5580 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5581 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5582 struct device *d = XDEVICE (XCAR (devcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5583 int preempted;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5584
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5585 if (d->buffers_changed || d->clip_changed || d->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5586 || d->faces_changed || d->frame_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5587 || d->icon_changed || d->menubar_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5588 || d->modeline_changed || d->point_changed || d->size_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5589 || d->toolbar_changed || d->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5590 || d->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5591 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5592 preempted = redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5593
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5594 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5595 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5596 preemption_count++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5597 RESET_CHANGED_SET_FLAGS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5598 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5599 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5601 /* See comment in redisplay_device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5602 if (d->size_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5603 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5604 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5605 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5606 preemption_count = 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 /* Mark redisplay as accurate */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5609 buffers_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5610 clip_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5611 extents_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5612 frame_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5613 icon_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5614 menubar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5615 modeline_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5616 point_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5617 toolbar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5618 windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5619 windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5620 RESET_CHANGED_SET_FLAGS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5621
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5622 if (faces_changed)
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_all_faces_as_clean ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5625 faces_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5626 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5628 if (!size_change_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5629 size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5630
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5631 reset_buffer_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5632
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5633 done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5634 unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5635 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5636
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5637 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5638 redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5639 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5640 if (last_display_warning_tick != display_warning_tick &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5641 !inhibit_warning_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5642 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5643 /* If an error occurs during this function, oh well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5644 If we report another warning, we could get stuck in an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5645 infinite loop reporting warnings. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5646 call0_trapping_errors (0, Qdisplay_warning_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5647 last_display_warning_tick = display_warning_tick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5648 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5649 /* The run_hook_trapping_errors functions are smart enough not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5650 to do any evalling if the hook function is empty, so there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5651 should not be any significant time loss. All places in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5652 C code that call redisplay() are prepared to handle GCing,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5653 so we should be OK. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5654 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5655 run_hook_trapping_errors ("Error in pre-redisplay-hook",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5656 Qpre_redisplay_hook);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5657 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5658
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5659 redisplay_without_hooks ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5661 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5662 run_hook_trapping_errors ("Error in post-redisplay-hook",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5663 Qpost_redisplay_hook);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5664 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5665 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5666
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5667 /* Inefficiently determine the line number of the line point is on and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5668 return it as a string. Always do this regardless of whether
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5669 line_number_mode is true. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5670
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5671 static char window_line_number_buf[100];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5672 static char *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5673 window_line_number (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5674 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5675 struct device *d = XDEVICE (XFRAME (w->frame)->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5676 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5677 Bufpos end =
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5678 ((w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5679 ? BUF_PT (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5680 : marker_position (w->pointm[type]));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5681 int lots = 999999999;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5682 int shortage, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5683
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5684 scan_buffer (b, '\n', end, 0, -lots, &shortage, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5685 line = lots - shortage + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5687 sprintf (window_line_number_buf, "%d", line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5689 return (window_line_number_buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5690 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5691
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5692 /* Given a character representing an object in a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5693 specification, return a string (stored into the global array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5694 `mode_spec_bufbyte_string') with the information that object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5695 represents.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5697 This function is largely unchanged from previous versions of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5698 redisplay engine. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5699
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5700 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5701 decode_mode_spec (struct window *w, Emchar spec, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5702 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5703 Lisp_Object obj = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5704 CONST char *str = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5705 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5706
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5707 Dynarr_reset (mode_spec_bufbyte_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5708
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5709 switch (spec)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5710 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5711 /* print buffer name */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5712 case 'b':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5713 obj = b->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5714 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5715
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5716 /* print visited file name */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5717 case 'f':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5718 obj = b->filename;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5719 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5720
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5721 /* print the current column */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5722 case 'c':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5723 {
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
5724 int col = current_column (b) + (column_number_start_at_one != 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5725 int temp = col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5726 int size = 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5727 char *buf;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5728
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5729 while (temp >= 10)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5730 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5731 temp /= 10;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5732 size++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5733 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5734
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5735 buf = (char *) alloca (size * sizeof (char));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5736 sprintf (buf, "%d", col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5737
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5738 Dynarr_add_many (mode_spec_bufbyte_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5739 (CONST Bufbyte *) buf, strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5741 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5742 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5743
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5744 #ifdef MULE
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5745 /* print the file coding system */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5746 case 'C':
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5747 {
110
fe104dbd9147 Import from CVS: tag r20-1b7
cvs
parents: 108
diff changeset
5748 Lisp_Object codesys = b->buffer_file_coding_system;
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5749 /* Be very careful here not to get an error. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5750 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5751 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5752 codesys = Ffind_coding_system (codesys);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5753 if (CODING_SYSTEMP (codesys))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5754 obj = Fcoding_system_property (codesys, Qmnemonic);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5755 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5756 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5757 break;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
5758 #endif
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5759
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5760 /* print the current line number */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5761 case 'l':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5762 str = window_line_number (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5763 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5764
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5765 /* print value of mode-name (obsolete) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5766 case 'm':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5767 obj = b->mode_name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5768 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5769
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5770 /* print Narrow if appropriate */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5771 case 'n':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5772 if (BUF_BEGV (b) > BUF_BEG (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5773 || BUF_ZV (b) < BUF_Z (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5774 str = " Narrow";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5775 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5776
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5777 /* print %, * or hyphen, if buffer is read-only, modified or neither */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5778 case '*':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5779 str = (!NILP (b->read_only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5780 ? "%"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5781 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5782 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5783 : "-"));
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 * or hyphen -- XEmacs change to allow a buffer to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5787 read-only but still indicate whether it is modified. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5788 case '+':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5789 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5790 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5791 : (!NILP (b->read_only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5792 ? "%"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5793 : "-"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5794 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5795
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5796 /* #### defined in 19.29 decode_mode_spec, but not in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5797 modeline-format doc string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5798 /* This differs from %* in that it ignores read-only-ness. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5799 case '&':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5800 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5801 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5802 : "-");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5803 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5804
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5805 /* print process status */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5806 case 's':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5807 obj = Fget_buffer_process (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5808 if (NILP (obj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5809 str = GETTEXT ("no process");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5810 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5811 obj = Fsymbol_name (Fprocess_status (obj));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5812 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5814 /* print name of selected frame (only meaningful under X Windows) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5815 case 'S':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5816 obj = XFRAME (w->frame)->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5817 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5818
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5819 /* indicate TEXT or BINARY */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5820 case 't':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5821 #ifdef MSDOS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5822 str = NILP (b->buffer_file_type) ? "T" : "B";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5823 #else /* not MSDOS */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5824 str = "T";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5825 #endif /* not MSDOS */
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5826 break;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5827
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5828 /* print percent of buffer above top of window, or Top, Bot or All */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5829 case 'p':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5830 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5831 Bufpos pos = marker_position (w->start[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5832 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5834 /* This had better be while the desired lines are being done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5835 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (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 if (pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5838 str = "All";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5839 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5840 str = "Bottom";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5841 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5842 else if (pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5843 str = "Top";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5844 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5845 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5846 /* This hard limit is ok since the string it will hold has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5847 fixed maximum length of 3. But just to be safe... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5848 char buf[10];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5849
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5850 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5851
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5852 /* We can't normally display a 3-digit number, so get us a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5853 2-digit number that is close. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5854 if (total == 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5855 total = 99;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5856
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5857 sprintf (buf, "%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5858 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5859 strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5860
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5861 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5862 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5863 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5864 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5865
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5866 /* print percent of buffer above bottom of window, perhaps plus
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5867 Top, or print Bottom or All */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5868 case 'P':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5869 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5870 Bufpos toppos = marker_position (w->start[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5871 Bufpos botpos = BUF_Z (b) - w->window_end_pos[type];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5872 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5873
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5874 /* 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
5875 only treat it as a hint. In particular, after erase-buffer,
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5876 botpos may be negative. */
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5877 if (botpos < toppos)
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5878 botpos = toppos;
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5879
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5880 if (botpos >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5881 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5882 if (toppos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5883 str = "All";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5884 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5885 str = "Bottom";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5886 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5887 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5888 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5889 /* This hard limit is ok since the string it will hold has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5890 fixed maximum length of around 6. But just to be safe... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5891 char buf[10];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5892
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5893 total = ((botpos - BUF_BEGV (b)) * 100 + total - 1) / total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5894
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5895 /* We can't normally display a 3-digit number, so get us a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5896 2-digit number that is close. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5897 if (total == 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5898 total = 99;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5899
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5900 if (toppos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5901 sprintf (buf, "Top%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5902 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5903 sprintf (buf, "%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5904
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5905 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5906 strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5907
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5908 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5909 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5910 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5911 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5912
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5913 /* print % */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5914 case '%':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5915 str = "%";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5916 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5917
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5918 /* print one [ for each recursive editing level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5919 case '[':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5920 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5921 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5922
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5923 if (command_loop_level > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5924 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5925 str = "[[[... ";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5926 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5927 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5928
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5929 for (i = 0; i < command_loop_level; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5930 Dynarr_add (mode_spec_bufbyte_string, '[');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5931
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5932 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5933 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5934
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5935 /* print one ] for each recursive editing level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5936 case ']':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5937 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5938 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5939
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5940 if (command_loop_level > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5941 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5942 str = "...]]]";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5943 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5944 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5945
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5946 for (i = 0; i < command_loop_level; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5947 Dynarr_add (mode_spec_bufbyte_string, ']');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5948
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5949 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5950 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5951
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5952 /* print infinitely many dashes -- handle at top level now */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5953 case '-':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5954 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5955
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5956 }
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 (STRINGP (obj))
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5959 Dynarr_add_many (mode_spec_bufbyte_string,
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5960 XSTRING_DATA (obj),
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5961 XSTRING_LENGTH (obj));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5962 else if (str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5963 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) str, strlen (str));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5964
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5965 decode_mode_spec_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5966 Dynarr_add (mode_spec_bufbyte_string, '\0');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5967 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5968
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 10
diff changeset
5969 /* Given a display line, free all of its data structures. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5970
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5971 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5972 free_display_line (struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5973 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5974 int block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5975
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5976 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5977 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5978 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5979 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5980 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5982 Dynarr_free (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5983 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5984
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5985 Dynarr_free (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5986 dl->display_blocks = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5987 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5988
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5989 if (dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5990 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5991 Dynarr_free (dl->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5992 dl->left_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5993 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5994
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5995 if (dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5996 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5997 Dynarr_free (dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5998 dl->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5999 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6000 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6002
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6003 /* Given an array of display lines, free them and all data structures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6004 contained within them. */
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_lines (display_line_dynarr *dla)
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 line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6010
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6011 for (line = 0; line < Dynarr_largest (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6012 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6013 free_display_line (Dynarr_atp (dla, line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6014 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6015
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6016 Dynarr_free (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6017 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6019 /* Call internal free routine for each set of display lines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6020
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6021 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6022 free_display_structs (struct window_mirror *mir)
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 (mir->current_display_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6025 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6026 free_display_lines (mir->current_display_lines);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6027 mir->current_display_lines = 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 (mir->desired_display_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6031 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6032 free_display_lines (mir->desired_display_lines);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6033 mir->desired_display_lines = 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 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6039 mark_redisplay_structs (display_line_dynarr *dla,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6040 void (*markobj) (Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6041 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6042 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6043
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6044 for (line = 0; line < Dynarr_length (dla); 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 int block, loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6047 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6049 for (block = 0; block < Dynarr_length (dl->display_blocks); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6050 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6051 int rune;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6052 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6053
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6054 for (rune = 0; rune < Dynarr_length (db->runes); rune++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6055 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6056 struct rune *rb = Dynarr_atp (db->runes, rune);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6057
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6058 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6059 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6060 if (!NILP (rb->object.dglyph.glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6061 ((markobj) (rb->object.dglyph.glyph));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6062 if (!NILP (rb->object.dglyph.extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6063 ((markobj) (rb->object.dglyph.extent));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6064 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6065 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6066 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6067
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6068 for (loop = 0; loop < 2; loop++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6069 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6070 glyph_block_dynarr *gba = (loop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6071 ? dl->right_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6072 : dl->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6073
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6074 if (gba != NULL)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6075 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6076 for (block = 0; block < Dynarr_length (gba); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6077 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6078 struct glyph_block *gb = Dynarr_atp (gba, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6079
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6080 if (!NILP (gb->glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6081 ((markobj) (gb->glyph));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6082 if (!NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6083 ((markobj) (gb->extent));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6084 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6085 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6086 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6087 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6088 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6090 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6091 mark_window_mirror (struct window_mirror *mir, void (*markobj)(Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6092 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6093 mark_redisplay_structs (mir->current_display_lines, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6094 mark_redisplay_structs (mir->desired_display_lines, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6095
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6096 if (mir->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6097 mark_window_mirror (mir->next, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6099 if (mir->hchild)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6100 mark_window_mirror (mir->hchild, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6101 else if (mir->vchild)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6102 mark_window_mirror (mir->vchild, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6103 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6105 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6106 mark_redisplay (void (*markobj)(Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6107 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6108 Lisp_Object frmcons, devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6109
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6110 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6111 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6112 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6113 update_frame_window_mirror (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6114 mark_window_mirror (f->root_mirror, markobj);
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 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6119 Line Start Cache Description and Rationale
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6120
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6121 The traditional scrolling code in Emacs breaks in a variable height world.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6122 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
6123 displayed at any given time is fixed. This led to a complete separation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6124 of the scrolling code from the redisplay code. In order to fully support
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6125 variable height lines, the scrolling code must actually be tightly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6126 integrated with redisplay. Only redisplay can determine how many lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6127 will be displayed on a screen for any given starting point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6129 What is ideally wanted is a complete list of the starting buffer position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6130 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
6131 display line. Maintaining such a full list would be very expensive. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6132 settle for having it include information for all areas which we happen to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6133 generate anyhow (i.e. the region currently being displayed) and for those
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6134 areas we need to work with.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6136 In order to ensure that the cache accurately represents what redisplay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6137 would actually show, it is necessary to invalidate it in many situations.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6138 If the buffer changes, the starting positions may no longer be correct.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6139 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
6140 These events happen frequently enough that the cache can end up being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6141 constantly disabled. With this potentially constant invalidation when is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6142 the cache ever useful?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6143
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6144 Even if the cache is invalidated before every single usage, it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6145 necessary. Scrolling often requires knowledge about display lines which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6146 are actually above or below the visible region. The cache provides a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6147 convenient light-weight method of storing this information for multiple
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6148 display regions. This knowledge is necessary for the scrolling code to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6149 always obey the First Golden Rule of Redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6151 If the cache already contains all of the information that the scrolling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6152 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
6153 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
6154 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
6155 region had to be generated anyway, so the cache ends up getting the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6156 information basically for free. In those cases where a user is simply
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6157 scrolling around viewing a buffer there is a high probability that this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6158 sufficient to always provide the needed information. The second thing we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6159 can do is be smart about invalidating the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6160
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6161 TODO -- Be smart about invalidating the cache. Potential places:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6163 + 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
6164 starting positions of any display lines. These types of buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6165 modifications should not invalidate the cache. This is actually a large
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6166 optimization for redisplay speed as well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6168 + Buffer modifications frequently only affect the display of lines at and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6169 below where they occur. In these situations we should only invalidate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6170 the part of the cache starting at where the modification occurs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6172 In case you're wondering, the Second Golden Rule of Redisplay is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6173 applicable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6174 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6176 /* 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
6177 allocating and freeing it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6178 line_start_cache_dynarr *internal_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6180 /* Makes internal_cache represent the TYPE display structs and only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6181 the TYPE display structs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6182
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6183 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6184 update_internal_cache_list (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6185 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6186 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6187 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6188
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6189 Dynarr_reset (internal_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6190 for (line = 0; line < Dynarr_length (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6191 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6192 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6194 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6195 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6196 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6197 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6198 struct line_start_cache lsc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6200 lsc.start = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6201 lsc.end = dl->end_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6202 lsc.height = dl->ascent + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6204 Dynarr_add (internal_cache, lsc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6205 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6206 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6207 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6208
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6209 /* Reset the line cache if necessary. This should be run at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6210 beginning of any function which access the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6211
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6212 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6213 validate_line_start_cache (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6214 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6215 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6216 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6218 if (!w->line_cache_validation_override)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6219 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6220 /* f->extents_changed used to be in here because extent face and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6221 size changes can cause text shifting. However, the extent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6222 covering the region is constantly having its face set and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6223 priority altered by the mouse code. This means that the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6224 start cache is constanty being invalidated. This is bad
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6225 since the mouse code also triggers heavy usage of the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6226 Since it is an unlikely that f->extents being changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6227 indicates that the cache really needs to be updated and if it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6228 does redisplay will catch it pretty quickly we no longer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6229 invalidate the cache if it is set. This greatly speeds up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6230 dragging out regions with the mouse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6231 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6232 || f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6233 || f->clip_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6234 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6235 Dynarr_reset (w->line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6236 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6237 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6238 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6239
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6240 /* Return the very first buffer position contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6241 window's cache, or -1 if the cache is empty. Assumes that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6242 cache is valid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6244 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6245 line_start_cache_start (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6246 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6247 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6248
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6249 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6250 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6251 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6252 return (Dynarr_atp (cache, 0)->start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6253 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6254
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6255 /* Return the very last buffer position contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6256 window's cache, or -1 if the cache is empty. Assumes that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6257 cache is valid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6259 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6260 line_start_cache_end (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6261 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6262 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6263
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6264 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6265 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6266 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6267 return (Dynarr_atp (cache, Dynarr_length (cache) - 1)->end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6268 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6270 /* Return the index of the line POINT is contained within in window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6271 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
6272 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
6273 a guarantee of the number of entries in the cache present on either
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6274 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
6275 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
6276 allowed to shift. Returns -1 if POINT cannot be found in the cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6277 for any reason. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6278
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6279 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6280 point_in_line_start_cache (struct window *w, Bufpos point, int min_past)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6281 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6282 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6283 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6284 unsigned int top, bottom, pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6286 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6287 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6289 /* Let functions pass in negative values, but we still treat -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6290 specially. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6291 /* #### bogosity alert */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6292 if (min_past < 0 && min_past != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6293 min_past = -min_past;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6295 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6296 || line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6297 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6298 int loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6299 int win_char_height = window_char_height (w, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6300
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6301 /* Occasionally we get here with a 0 height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6302 window. find_next_newline_no_quit will abort if we pass it a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6303 count of 0 so handle that case. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6304 if (!win_char_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6305 win_char_height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6307 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6308 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6309 Bufpos from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6310 Bufpos to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6311
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6312 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6314 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6315 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6316 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6317 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6318 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6319 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6321 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6323 loop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6324 while (line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6325 && (loop < cache_adjustment || min_past == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6326 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6327 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6328
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6329 from = line_start_cache_start (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6330 if (from <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6331 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6333 from = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6334 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6336 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6337 loop++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6338 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6339
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6340 if (line_start_cache_start (w) > point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6341 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6342 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6343
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6344 from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6345 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6346 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6347 to = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6348 from = to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6349 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6350 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6351 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6352 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6354 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6355 }
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_end (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 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6364 if (to >= BUF_ZV (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 = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6368 to = find_next_newline_no_quit (b, from, win_char_height);
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_end (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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6392 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6393
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6394 if (min_past == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6395 min_past = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6396
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6397 /* This could happen if the buffer is narrowed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6398 if (line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6399 || line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6400 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6401 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6402 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6403 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6404
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6405 find_point_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 top = Dynarr_length (cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6408 bottom = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6409
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6410 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6411 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6412 unsigned int new_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6413 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6414
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6415 pos = (bottom + top + 1) >> 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6416 start = Dynarr_atp (cache, pos)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6417 end = Dynarr_atp (cache, pos)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6418
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6419 if (point >= start && point <= end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6420 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6421 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6422 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6423 Bufpos from =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6424 find_next_newline_no_quit (b, line_start_cache_start (w),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6425 -min_past - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6426 Bufpos to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6427
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6428 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6429 goto find_point_loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6430 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6431 else if ((Dynarr_length (cache) - pos - 1) < min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6432 && line_start_cache_end (w) < BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6433 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6434 Bufpos from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6435 Bufpos to = find_next_newline_no_quit (b, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6436 (min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6437 ? min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6438 : 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6439
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6440 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6441 goto find_point_loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6442 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6443 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6444 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6445 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6446 return pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6447 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6448 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6449 else if (point > end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6450 bottom = pos + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6451 else if (point < start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6452 top = pos - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6453 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6454 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6455
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6456 new_pos = (bottom + top + 1) >> 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6457 if (pos == new_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6458 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6459 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6460 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6461 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6462 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6463 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6464
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6465 /* Return a boolean indicating if POINT would be visible in window W
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6466 if display of the window was to begin at STARTP. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6468 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6469 point_would_be_visible (struct window *w, Bufpos startp, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6470 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6471 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6472 int pixpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6473 int bottom = WINDOW_TEXT_HEIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6474 int start_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6475
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6476 /* If point is before the intended start it obviously can't be visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6477 if (point < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6478 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6479
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6480 /* If point or start are not in the accessible buffer range, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6481 fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6482 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6483 || point < BUF_BEGV (b) || point > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6484 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6485 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6486 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6487 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6488
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6489 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6490 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6491
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6492 start_elt = point_in_line_start_cache (w, startp, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6493 if (start_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6494 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6495 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6496 return 0;
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 assert (line_start_cache_start (w) <= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6500 && line_start_cache_end (w) >= 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 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6503 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6504 int height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6505
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6506 /* Expand the cache if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6507 if (start_elt == Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6508 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6509 Bufpos old_startp =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6510 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6512 start_elt = point_in_line_start_cache (w, old_startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6513 window_char_height (w, 0));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6514
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6515 /* We've already actually processed old_startp, so increment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6516 immediately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6517 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6519 /* If this happens we didn't add any extra elements. Bummer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6520 if (start_elt == Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6521 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6522 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6523 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6524 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6525 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6526
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6527 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6529 if (pixpos + height > bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6530 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6531 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6532 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6533 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6534 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6535 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6536 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6538 pixpos += height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6539 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6540 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6541 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6542 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6543 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6544
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6545 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6546 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6547 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6549 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6550 the buffer position at the beginning or end of the last line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6551 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
6552 position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6554 #### With a little work this could probably be reworked as just a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6555 call to start_with_line_at_pixpos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6557 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6558 start_end_of_last_line (struct window *w, Bufpos startp, int end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6559 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6560 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6561 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6562 int pixpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6563 int bottom = WINDOW_TEXT_HEIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6564 Bufpos cur_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6565 int start_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6567 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6568 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6569
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6570 if (startp < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6571 startp = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6572 else if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6573 startp = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6574 cur_start = startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6575
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6576 start_elt = point_in_line_start_cache (w, cur_start, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6577 if (start_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6578 abort (); /* this had better never happen */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6579
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6580 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6581 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6582 int height = Dynarr_atp (cache, start_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6584 cur_start = Dynarr_atp (cache, start_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6586 if (pixpos + height > bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6587 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6588 /* Adjust for any possible clip. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6589 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6590 start_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6592 if (start_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6593 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6594 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6595 if (end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6596 return (BUF_ZV (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6597 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6598 return (BUF_BEGV (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6599 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6600 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6601 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6602 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6603 if (end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6604 return Dynarr_atp (cache, start_elt)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6605 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6606 return Dynarr_atp (cache, start_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6607 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6608 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6610 pixpos += height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6611 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6612 if (start_elt == Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6613 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6614 Bufpos from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6615 int win_char_height = window_char_height (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6616 Bufpos to = find_next_newline_no_quit (b, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6617 (win_char_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6618 ? win_char_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6619 : 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6620
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6621 /* 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
6622 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6623 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6624 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6625 return (BUF_ZV (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6626 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6628 update_line_start_cache (w, from, to, BUF_PT (b), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6630 /* Updating the cache invalidates any current indexes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6631 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6632 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6633 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6634 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6635
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6636 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6637 the buffer position at the beginning of the last line displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6639 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6640 start_of_last_line (struct window *w, Bufpos startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6641 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6642 return start_end_of_last_line (w, startp, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6643 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6644
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6645 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6646 the buffer position at the end of the last line displayed. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6647 also know as the window end position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6648
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6649 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6650 end_of_last_line (struct window *w, Bufpos startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6651 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6652 return start_end_of_last_line (w, startp, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6653 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6654
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6655 /* For window W, what does the starting position have to be so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6656 the line containing POINT will cover pixel position PIXPOS. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6657
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6658 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6659 start_with_line_at_pixpos (struct window *w, Bufpos point, int pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6660 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6661 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6662 int cur_elt;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6663 Bufpos cur_pos, prev_pos = point;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6664 int point_line_height;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6665 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6666
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6667 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6668 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6670 cur_elt = point_in_line_start_cache (w, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6671 /* #### See comment in update_line_start_cache about big minibuffers. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6672 if (cur_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6673 return point;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6674
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6675 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6676
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6677 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6678 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6679 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6680
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6681 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6682
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6683 /* Do not take into account the value of vertical_clip here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6684 That is the responsibility of the calling functions. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6685 if (pixheight < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6686 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6687 w->line_cache_validation_override--;
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6688 if (-pixheight > point_line_height)
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6689 /* We can't make the target line cover pixpos, so put it
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6690 above pixpos. That way it will at least be visible. */
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6691 return prev_pos;
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6692 else
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6693 return cur_pos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6694 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6695
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6696 cur_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6697 if (cur_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6698 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6699 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6700 int win_char_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6701
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6702 if (cur_pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6703 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6704 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6705 return (BUF_BEGV (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6706 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6707
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6708 win_char_height = window_char_height (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6709 if (!win_char_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6710 win_char_height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6711
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6712 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6713 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6714 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6715
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6716 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6717 assert (cur_elt >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6718 }
116
9f59509498e1 Import from CVS: tag r20-1b10
cvs
parents: 110
diff changeset
6719 prev_pos = cur_pos;
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 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6722
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6723 /* For window W, what does the starting position have to be so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6724 the line containing point is on display line LINE. If LINE is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6725 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
6726 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
6727 considered to be the number of lines from the bottom (-1 is the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6728 bottom line). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6729
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6730 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6731 start_with_point_on_display_line (struct window *w, Bufpos point, int line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6732 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6733 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6734 w->line_cache_validation_override++;
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 (line >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6737 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6738 int cur_elt = point_in_line_start_cache (w, point, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6739
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6740 if (cur_elt - line < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6741 cur_elt = 0; /* Hit the top */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6742 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6743 cur_elt -= line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6745 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6746 return (Dynarr_atp (w->line_start_cache, cur_elt)->start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6747 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6748 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6749 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6750 /* The calculated value of pixpos is correct for the bottom line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6751 or what we want when line is -1. Therefore we subtract one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6752 because we have already handled one line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6753 int new_line = -line - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6754 int cur_elt = point_in_line_start_cache (w, point, new_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6755 int pixpos = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6756 Bufpos retval, search_point;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6757
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6758 /* If scroll_on_clipped_lines is false, the last "visible" line of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6759 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6760 If s_o_c_l is true, then we don't want to count a clipped
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6761 line, so back up from the bottom by the height of the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6762 containing point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6763 if (scroll_on_clipped_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6764 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6765 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6766 pixpos -= 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6767
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6768 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6769 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6770 /* Hit the bottom of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6771 int adjustment =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6772 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6773 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6774 int defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6776 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6777 default_face_height_and_width (window, &defheight, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6779 cur_elt = Dynarr_length (w->line_start_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6780
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6781 pixpos -= (adjustment * defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6782 if (pixpos < WINDOW_TEXT_TOP (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6783 pixpos = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6784 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6785 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6786 cur_elt = cur_elt + new_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6788 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6790 retval = start_with_line_at_pixpos (w, search_point, pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6791 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6792 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6793 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6794 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6795
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6796 /* This is used to speed up vertical scrolling by caching the known
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6797 buffer starting positions for display lines. This allows the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6798 scrolling routines to avoid costly calls to regenerate_window. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6799 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
6800 display structs which are in the given range.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6802 Note also that the FROM/TO values are minimums. It is possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6803 that this function will actually add information outside of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6804 lines containing those positions. This can't hurt but it could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6805 possibly help.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6806
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6807 #### We currently force the cache to have only 1 contiguous region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6808 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
6809 cover more areas. This might, however, turn out to be a lot of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6810 overhead for too little gain. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6811
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6812 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6813 update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6814 Bufpos point, int no_regen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6815 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6816 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6817 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6818 Bufpos low_bound, high_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6819
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6820 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6821 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6822 updating_line_start_cache = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6824 if (from < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6825 from = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6826 if (to > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6827 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6828
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6829 if (from > to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6830 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6831 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6832 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6833 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6834 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6835
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6836 if (Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6837 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6838 low_bound = line_start_cache_start (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6839 high_bound = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6840
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6841 /* Check to see if the desired range is already in the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6842 if (from >= low_bound && to <= high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6843 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6844 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6845 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6846 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6847 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6849 /* Check to make sure that the desired range is adjacent to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6850 current cache. If not, invalidate the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6851 if (to < low_bound || from > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6852 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6853 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6854 low_bound = high_bound = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6855 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6856 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6857 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6858 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6859 low_bound = high_bound = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6860 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6862 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6863
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6864 /* This could be integrated into the next two sections, but it is easier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6865 to follow what's going on by having it separate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6866 if (no_regen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6867 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6868 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6869
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6870 update_internal_cache_list (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6871 if (!Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6872 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6873 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6874 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6875 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6876 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6877
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6878 start = Dynarr_atp (internal_cache, 0)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6879 end =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6880 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6881
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6882 /* We aren't allowed to generate additional information to fill in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6883 gaps, so if the DESIRED structs don't overlap the cache, reset the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6884 cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6885 if (Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6886 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6887 if (end < low_bound || start > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6888 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6889
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6890 /* #### What should really happen if what we are doing is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6891 extending a line (the last line)? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6892 if (Dynarr_length (cache) == 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6893 && Dynarr_length (internal_cache) == 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6894 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6895 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6896
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6897 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6898 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6899 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6900 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6901 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6902 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6903 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6904 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6905
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6906 /* An extra check just in case the calling function didn't pass in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6907 the bounds of the DESIRED structs in the first place. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6908 if (start >= low_bound && end <= high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6909 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6910 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6911 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6912 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6913 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6914
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6915 /* At this point we know that the internal cache partially overlaps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6916 the main cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6917 if (start < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6918 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6919 int ic_elt = Dynarr_length (internal_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6920 while (ic_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6921 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6922 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6923 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6924 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6925 ic_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6926 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6927
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6928 if (!(ic_elt >= 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6929 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6930 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6931 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6932 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6933 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6934 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6935 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6936 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6937
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6938 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6939 ic_elt + 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6940 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6941
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6942 if (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 int ic_elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6945
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6946 while (ic_elt < Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6947 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6948 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6949 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6950 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6951 ic_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6952 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6953
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6954 if (!(ic_elt < Dynarr_length (internal_cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6955 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6956 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6957 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6958 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6959 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6960 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6961 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6962 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6964 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6965 Dynarr_length (internal_cache) - ic_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6966 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6967
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6968 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6969 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6970 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6971 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6972
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6973 if (!Dynarr_length (cache) || from < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6974 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6975 Bufpos startp = find_next_newline_no_quit (b, from, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6976 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6977 int old_lb = low_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6978
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6979 while (startp < old_lb || low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6980 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6981 int ic_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6982
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6983 regenerate_window (w, startp, point, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6984 update_internal_cache_list (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6986 /* If this assert is triggered then regenerate_window failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6987 to layout a single line. That is not supposed to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6988 possible because we impose a minimum height on the buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6989 and override vertical clip when we are in here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6990 /* #### Ah, but it is because the window may temporarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6991 exist but not have any lines at all if the minibuffer is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6992 real big. Look into that situation better. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6993 if (!Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6994 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6995 if (old_lb == -1 && low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6996 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6997 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6998 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6999 return;
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 assert (Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7003 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7004 assert (startp == Dynarr_atp (internal_cache, 0)->start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7005
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7006 ic_elt = Dynarr_length (internal_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7007 if (low_bound != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7008 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7009 while (ic_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7010 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7011 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7012 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7013 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7014 ic_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7015 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7016 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7017 assert (ic_elt >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7019 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7020 ic_elt + 1, marker);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7021 marker += (ic_elt + 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7022
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7023 if (startp < low_bound || low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7024 low_bound = startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7025 startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7026 if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7027 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7028 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7029 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7030 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7031 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7032 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7033 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7034
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7035 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7036 assert (from >= low_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7038 /* Readjust the high_bound to account for any changes made while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7039 correcting the low_bound. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7040 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7042 if (to > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7043 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7044 Bufpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7045
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7046 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7047 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7048 regenerate_window (w, startp, point, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7049 update_internal_cache_list (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7050
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7051 /* See comment above about regenerate_window failing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7052 assert (Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7053
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7054 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7055 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7056 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7057 startp = high_bound + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7058 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7059 while (to > high_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7060 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7061
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 assert (to <= high_bound);
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 /* Given x and y coordinates in characters, relative to a window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7069 return the pixel location corresponding to those coordinates. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7070 pixel location returned is the center of the given character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7071 position. The pixel values are generated relative to the window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7072 not the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7073
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7074 The modeline is considered to be part of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7075
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7076 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7077 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7078 int *pix_x, int *pix_y)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7079 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7080 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7081 int num_disp_lines, modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7082 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7083 int defheight, defwidth;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7084
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7085 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7086 default_face_height_and_width (window, &defheight, &defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7087
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7088 /* 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
7089 the window, use the first window line or character position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7090 instead. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7091 if (char_y < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7092 char_y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7093 if (char_x < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7094 char_x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7095
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7096 num_disp_lines = Dynarr_length (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7097 modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7098 if (num_disp_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7099 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7100 if (Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7101 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7102 num_disp_lines--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7103 modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7104 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7105 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7107 /* First check if the y position intersects the display lines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7108 if (char_y < num_disp_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7109 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7110 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7111 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7112
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7113 *pix_y = (dl->ypos - dl->ascent +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7114 ((unsigned int) (dl->ascent + dl->descent - dl->clip) >> 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7115
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7116 if (char_x < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7117 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7118 struct rune *rb = Dynarr_atp (db->runes, char_x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7120 *pix_x = rb->xpos + (rb->width >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7121 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7122 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7123 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7124 int last_rune = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7125 struct rune *rb = Dynarr_atp (db->runes, last_rune);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7126
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7127 char_x -= last_rune;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7129 *pix_x = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7130 *pix_x += ((char_x - 1) * defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7131 *pix_x += (defwidth >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7132 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7133 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7134 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7135 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7136 /* It didn't intersect, so extrapolate. #### For now, we include the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7137 modeline in this since we don't have true character positions in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7138 it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7139
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7140 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7141 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7143 char_y -= num_disp_lines;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7145 if (Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7146 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7147 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7148 *pix_y = dl->ypos + dl->descent - dl->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7149 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7150 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7151 *pix_y = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7153 *pix_y += (char_y * defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7154 *pix_y += (defheight >> 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 *pix_x = WINDOW_TEXT_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7157 /* Don't adjust by one because this is still the unadjusted value. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7158 *pix_x += (char_x * defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7159 *pix_x += (defwidth >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7160 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7162 if (*pix_x > w->pixel_left + w->pixel_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7163 *pix_x = w->pixel_left + w->pixel_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7164 if (*pix_y > w->pixel_top + w->pixel_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7165 *pix_y = w->pixel_top + w->pixel_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7167 *pix_x -= w->pixel_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7168 *pix_y -= w->pixel_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7169 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7170
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7171 /* Given a display line and a position, determine if there is a glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7172 there and return information about it if there is. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7174 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7175 get_position_object (struct display_line *dl, Lisp_Object *obj1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7176 Lisp_Object *obj2, int x_coord, int *low_x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7177 int *high_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7178 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7179 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7180 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7181 int block =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7182 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7183
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7184 /* We use get_next_display_block to get the actual display block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7185 that would be displayed at x_coord. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7186
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7187 if (block == NO_BLOCK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7188 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7189 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7190 db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7191
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7192 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7193 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7194 struct rune *rb = Dynarr_atp (db->runes, elt);
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 (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7197 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7198 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7199 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7200 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7201 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7202 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7203 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7204 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7205 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7206 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7207 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7208
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7209 if (low_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7210 *low_x_coord = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7211 if (high_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7212 *high_x_coord = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7213
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7214 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7215 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7216 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7217 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7219 #define UPDATE_CACHE_RETURN \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7220 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7221 d->pixel_to_glyph_cache.valid = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7222 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7223 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7224 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7225 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7226 d->pixel_to_glyph_cache.frame = f; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7227 d->pixel_to_glyph_cache.col = *col; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7228 d->pixel_to_glyph_cache.row = *row; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7229 d->pixel_to_glyph_cache.obj_x = *obj_x; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7230 d->pixel_to_glyph_cache.obj_y = *obj_y; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7231 d->pixel_to_glyph_cache.w = *w; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7232 d->pixel_to_glyph_cache.bufpos = *bufpos; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7233 d->pixel_to_glyph_cache.closest = *closest; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7234 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7235 d->pixel_to_glyph_cache.obj1 = *obj1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7236 d->pixel_to_glyph_cache.obj2 = *obj2; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7237 d->pixel_to_glyph_cache.retval = position; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7238 RETURN__ position; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7239 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7240
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7241 /* Given x and y coordinates in pixels relative to a frame, return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7242 information about what is located under those coordinates.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7244 The return value will be one of:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7245
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7246 OVER_TOOLBAR: over one of the 4 frame toolbars
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7247 OVER_MODELINE: over a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7248 OVER_BORDER: over an internal border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7249 OVER_NOTHING: over the text area, but not over text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7250 OVER_OUTSIDE: outside of the frame border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7251 OVER_TEXT: over text in the text area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7252
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7253 OBJ1 is one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7254
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7255 -- a toolbar button
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7256 -- a glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7257 -- nil if the coordinates are not over a glyph or a toolbar button.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7259 OBJ2 is one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7260
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7261 -- an extent, if the coordinates are over a glyph in the text area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7262 -- nil otherwise.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7263
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7264 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
7265 equivalent coordinates relative to the upper-left corner of the glyph.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7266
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7267 If the coordinates are over a character, OBJ_X and OBJ_Y give the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7268 equivalent coordinates relative to the upper-left corner of the character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7270 Otherwise, OBJ_X and OBJ_Y are undefined.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7271 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7272
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7273 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7274 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7275 int *col, int *row, int *obj_x, int *obj_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7276 struct window **w, Bufpos *bufpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7277 Bufpos *closest, Charcount *modeline_closest,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7278 Lisp_Object *obj1, Lisp_Object *obj2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7279 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7280 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7281 struct pixel_to_glyph_translation_cache *cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7282 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7283 int frm_left, frm_right, frm_top, frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7284 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7285 int position = OVER_NOTHING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7286 int device_check_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7287 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7288
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7289 /* 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
7290 the middle of being deleted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7291 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7292 device_check_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7293 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7294 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7295 d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7296 cache = &d->pixel_to_glyph_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7297 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7299 if (!device_check_failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7300 && cache->valid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7301 && cache->frame == f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7302 && cache->low_x_coord <= x_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7303 && cache->high_x_coord > x_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7304 && cache->low_y_coord <= y_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7305 && cache->high_y_coord > y_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7306 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7307 *col = cache->col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7308 *row = cache->row;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7309 *obj_x = cache->obj_x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7310 *obj_y = cache->obj_y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7311 *w = cache->w;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7312 *bufpos = cache->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7313 *closest = cache->closest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7314 *modeline_closest = cache->modeline_closest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7315 *obj1 = cache->obj1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7316 *obj2 = cache->obj2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7317
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7318 return cache->retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7319 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7320 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7321 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7322 *col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7323 *row = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7324 *obj_x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7325 *obj_y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7326 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7327 *bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7328 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7329 *modeline_closest = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7330 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7331 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7333 low_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7334 high_x_coord = x_coord + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7335 low_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7336 high_y_coord = y_coord + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7337 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7338
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7339 if (device_check_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7340 return OVER_NOTHING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7342 frm_left = FRAME_LEFT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7343 frm_right = FRAME_RIGHT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7344 frm_top = FRAME_TOP_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7345 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7346
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7347 /* Check if the mouse is outside of the text area actually used by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7348 redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7349 if (y_coord < frm_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7350 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7351 if (y_coord >= FRAME_TOP_BORDER_START (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7352 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7353 low_y_coord = FRAME_TOP_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7354 high_y_coord = frm_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7355 position = OVER_BORDER;
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 if (y_coord >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7358 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7359 low_y_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7360 high_y_coord = FRAME_TOP_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7361 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7362 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7363 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7364 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7365 low_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7366 high_y_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7367 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7368 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7369 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7370 else if (y_coord >= frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7371 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7372 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7373 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7374 low_y_coord = frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7375 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7376 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7377 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7378 else if (y_coord < FRAME_PIXHEIGHT (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7379 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7380 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7381 high_y_coord = FRAME_PIXHEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7382 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7383 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7384 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7385 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7386 low_y_coord = FRAME_PIXHEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7387 high_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7388 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7389 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7390 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7392 if (position != OVER_TOOLBAR && 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 if (x_coord < frm_left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7395 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7396 if (x_coord >= FRAME_LEFT_BORDER_START (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7397 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7398 low_x_coord = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7399 high_x_coord = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7400 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7401 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7402 else if (x_coord >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7403 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7404 low_x_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7405 high_x_coord = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7406 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7407 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7408 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7409 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7410 low_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7411 high_x_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7412 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7413 }
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 (x_coord >= frm_right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7416 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7417 if (x_coord < FRAME_RIGHT_BORDER_END (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7418 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7419 low_x_coord = frm_right;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7420 high_x_coord = FRAME_RIGHT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7421 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7422 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7423 else if (x_coord < FRAME_PIXWIDTH (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7424 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7425 low_x_coord = FRAME_RIGHT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7426 high_x_coord = FRAME_PIXWIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7427 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7428 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7429 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7430 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7431 low_x_coord = FRAME_PIXWIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7432 high_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7433 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7434 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7435 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7436 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7437
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7438 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7439 if (position == OVER_TOOLBAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7440 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7441 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7442 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7443 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7444 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7445 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7446 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7448 /* 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
7449 relative y position even if it is outside the x boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7450 if (x_coord < frm_left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7451 x_coord = frm_left;
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 x_coord = frm_right;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7454
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7455 /* Same in reverse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7456 if (y_coord < frm_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7457 y_coord = frm_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7458 else if (y_coord > frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7459 y_coord = frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7461 /* Find what window the given coordinates are actually in. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7462 window = f->root_window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7463 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7464
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7465 /* If we didn't find a window, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7466 if (!*w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7467 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7468 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7469 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7470 else if (position != OVER_NOTHING)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7471 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7472 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7473 *modeline_closest = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7475 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7476 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7477 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7478 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7479 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7480 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7481
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7482 /* Check if the window is a minibuffer but isn't active. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7483 if (MINI_WINDOW_P (*w) && !minibuf_level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7484 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7485 /* Must reset the window value since some callers will ignore
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7486 the return value if it is set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7487 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7488 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7489 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7491 dla = window_display_lines (*w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7492
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7493 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7494 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7495 int really_over_nothing = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7496 struct display_line *dl = Dynarr_atp (dla, *row);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7497
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7498 if ((int) (dl->ypos - dl->ascent) <= y_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7499 && y_coord <= (int) (dl->ypos + dl->descent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7500 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7501 int check_margin_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7502 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7503 struct rune *rb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7504
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7505 if (x_coord < dl->bounds.left_white
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7506 || x_coord >= dl->bounds.right_white)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7507 check_margin_glyphs = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7508
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7509 low_y_coord = dl->ypos - dl->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7510 high_y_coord = dl->ypos + dl->descent + 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 (position == OVER_BORDER
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7513 || position == OVER_OUTSIDE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7514 || check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7515 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7516 int x_check, left_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7517
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7518 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7519 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7520 x_check = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7521 left_bound = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7522 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7523 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7524 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7525 x_check = high_x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7526 left_bound = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7527 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7529 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7530 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7531 if (x_check <= left_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7532 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7533 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7534 *modeline_closest = Dynarr_atp (db->runes, 0)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7535 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7536 *closest = Dynarr_atp (db->runes, 0)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7537 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7538 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7539 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7540 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7541 *modeline_closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7542 Dynarr_atp (db->runes,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7543 Dynarr_length (db->runes) - 1)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7544 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7545 *closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7546 Dynarr_atp (db->runes,
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
7547 Dynarr_length (db->runes) - 1)->bufpos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7548 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7549
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7550 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7551 *modeline_closest += dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7552 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7553 *closest += dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7554 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7555 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7556 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7557 /* #### What should be here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7558 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7559 *modeline_closest = 0;
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 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7562 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7564 if (check_margin_glyphs)
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 (x_coord < dl->bounds.left_in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7567 || x_coord >= dl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7568 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7569 /* If we are over the outside margins then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7570 know the loop over the text block isn't going
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7571 to accomplish anything. So we go ahead and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7572 set what information we can right here and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7573 return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7574 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7575 *obj_y = y_coord - (dl->ypos - dl->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7576 get_position_object (dl, obj1, obj2, x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7577 &low_x_coord, &high_x_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7578
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7579 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7580 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7581 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7582 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7583 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7584 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7585
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7586 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7587 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7588 int past_end = (*col == Dynarr_length (db->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7589
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7590 if (!past_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7591 rb = Dynarr_atp (db->runes, *col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7592
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7593 if (past_end ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7594 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7595 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7596 if (past_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7597 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7598 (*col)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7599 rb = Dynarr_atp (db->runes, *col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7600 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7601
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7602 *bufpos = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7603 low_x_coord = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7604 high_x_coord = rb->xpos + rb->width;
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 (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7607 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7608 int elt = *col + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7610 /* Find the first character after the glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7611 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7612 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7613 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7614 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7615 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7616 *modeline_closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7617 (Dynarr_atp (db->runes, elt)->bufpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7618 dl->offset);
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 *closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7621 (Dynarr_atp (db->runes, elt)->bufpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7622 dl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7623 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7624 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7625
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7626 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7627 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7629 /* In this case we failed to find a non-glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7630 character so we return the last position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7631 displayed on the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7632 if (elt == Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7633 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7634 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7635 *modeline_closest = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7636 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7637 *closest = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7638 really_over_nothing = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7639 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7640 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7641 else
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 (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7644 *modeline_closest = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7645 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7646 *closest = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7647 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7648
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7649 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7650 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7651 *row = window_displayed_height (*w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7652
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7653 if (position == OVER_NOTHING)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7654 position = OVER_MODELINE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7655
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7656 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7657 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7658 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7659 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7660 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7661 else if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7662 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7663 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7664 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7665 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7666 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7667 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7668 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7669 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7670 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7672 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7673 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7674 else if (past_end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7675 || (rb->type == RUNE_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7676 && rb->object.chr.ch == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7677 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7678 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7679 /* At this point we may have glyphs in the right
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7680 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7681 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7682 get_position_object (dl, obj1, obj2, x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7683 &low_x_coord, &high_x_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7684 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7685 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7686 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7687 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7688 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7689 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7690 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7691 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7692 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7693 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7694 else if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7695 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7696 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7697 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7698 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7699 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7700 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7701 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7702 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7703 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7705 *obj_x = x_coord - rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7706 *obj_y = y_coord - (dl->ypos - dl->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7707
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7708 /* At this point we may have glyphs in the left
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7709 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7710 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7711 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7712
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7713 if (position == OVER_NOTHING && !really_over_nothing)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7714 position = OVER_TEXT;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7715
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7716 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7717 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7718 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7719 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7720 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7721 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7722
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7723 *row = Dynarr_length (dla) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7724 if (FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7725 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7726 int bot_elt = Dynarr_length (dla) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7727
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7728 if (bot_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7729 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7730 struct display_line *dl = Dynarr_atp (dla, bot_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7731 int adj_area = y_coord - (dl->ypos + dl->descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7732 Lisp_Object lwin = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7733 int defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7734
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7735 XSETWINDOW (lwin, *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7736 default_face_height_and_width (lwin, 0, &defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7737
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7738 *row += (adj_area / defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7739 }
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 /* #### This should be checked out some more to determine what
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7743 should really be going on. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7744 if (!MARKERP ((*w)->start[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7745 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7746 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7747 *closest = end_of_last_line (*w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7748 marker_position ((*w)->start[CURRENT_DISP]));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7749 *col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7750 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7751 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7752 #undef UPDATE_CACHE_RETURN
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7753
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 /* Lisp functions */
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
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7761 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7762 Ensure that all minibuffers are correctly showing the echo area.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7763 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7764 ())
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7765 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7766 Lisp_Object devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7767
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7768 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7769 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7770 struct device *d = XDEVICE (XCAR (devcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7771 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7772
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7773 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7774 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7775 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7776
108
360340f9fd5f Import from CVS: tag r20-1b6
cvs
parents: 100
diff changeset
7777 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7778 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7779 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7780 redisplay_window (window, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7781 call_redisplay_end_triggers (XWINDOW (window), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7782 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7783 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7784
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7785 /* We now call the output_end routine for tty frames. We delay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7786 doing so in order to avoid cursor flicker. So much for 100%
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7787 encapsulation. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7788 if (DEVICE_TTY_P (d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7789 DEVMETH (d, output_end, (d));
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 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7793 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7794
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7795 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7796 restore_disable_preemption_value (Lisp_Object value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7797 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7798 disable_preemption = XINT (value);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7799 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7800 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7801
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7802 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7803 Clear frame FRAME and output again what is supposed to appear on it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7804 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7805 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7806 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
7807 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7808 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7809 (frame, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7810 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7811 struct frame *f = decode_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7812 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7814 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7815 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7816 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7817 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7818 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7819 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7820
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7821 f->clear = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7822 redisplay_frame (f, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7824 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7825 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7826
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7827 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7828 Ensure that FRAME's contents are correctly displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7829 This differs from `redraw-frame' in that it only redraws what needs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7830 be updated, as opposed to unconditionally clearing and redrawing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7831 the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7832 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7833 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7834 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
7835 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7836 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7837 (frame, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7838 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7839 struct frame *f = decode_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7840 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7841
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7842 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7843 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7844 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7845 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7846 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7847 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7849 redisplay_frame (f, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7850
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7851 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7852 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7853
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7854 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7855 Clear device DEVICE and output again what is supposed to appear on it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7856 DEVICE defaults to the selected device if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7857 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7858 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
7859 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7860 */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
7861 (device, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7862 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7863 struct device *d = decode_device (device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7864 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7865 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7867 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7868 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7869 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7870 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7871 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7872 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7873
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7874 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7875 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7876 XFRAME (XCAR (frmcons))->clear = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7877 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7878 redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7879
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7880 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7881 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7882
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7883 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7884 Ensure that DEVICE's contents are correctly displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7885 This differs from `redraw-device' in that it only redraws what needs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7886 be updated, as opposed to unconditionally clearing and redrawing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7887 the device.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7888 DEVICE defaults to the selected device if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7889 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7890 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
7891 input and is guaranteed to proceed to completion.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7892 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7893 (device, no_preempt))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7894 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7895 struct device *d = decode_device (device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7896 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7898 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7899 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7900 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7901 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7902 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7903 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7904
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7905 redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7906
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7907 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7908 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7909
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7910 /* Big lie. Big lie. This will force all modelines to be updated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7911 regardless if the all flag is set or not. It remains in existence
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7912 solely for backwards compatibility. */
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7913 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7914 Force the modeline of the current buffer to be redisplayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7915 With optional non-nil ALL, force redisplay of all modelines.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7916 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7917 (all))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7918 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7919 MARK_MODELINE_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7920 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7921 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7922
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7923 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7924 Force an immediate update of the cursor on FRAME.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7925 FRAME defaults to the selected frame if omitted.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
7926 */
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
7927 (frame))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7928 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7929 redisplay_redraw_cursor (decode_frame (frame), 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7930 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7931 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7932
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7933
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7934 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7935 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7936 /* Lisp-variable change triggers */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7937 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7938 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7939
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7940 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7941 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7942 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7943 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7944 /* Nothing to be done? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7945 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7947 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7948 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7949 Lisp_Object in_object, int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7950 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7951 /* #### clip_changed should really be renamed something like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7952 global_redisplay_change. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7953 MARK_CLIP_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7954 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7955 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7956
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7957 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7958 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7959 Lisp_Object locale)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7960 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7961 MARK_CLIP_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7962 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7964 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7965 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7966 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7967 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7968 if (XFRAME (w->frame)->init_finished)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7969 Fforce_cursor_redisplay (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7970 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7971
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7972 #ifdef MEMORY_USAGE_STATS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7973
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7975 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7976 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7977 /* memory usage computation */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7978 /* */
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 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7982 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7983 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7984 int total = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7986 if (dyn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7987 total += Dynarr_memory_usage (dyn, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7988
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7989 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7990 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7992 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7993 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7994 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7995 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7996 int total = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7997
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7998 if (dyn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7999 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8000 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8002 total += Dynarr_memory_usage (dyn, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8003 for (i = 0; i < Dynarr_largest (dyn); i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8004 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8005 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8006
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8007 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8008 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8009
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8010 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8011 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8012 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8013 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8014 int total = 0;
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 (dyn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8017 total += Dynarr_memory_usage (dyn, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8019 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8020 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8022 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8023 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8024 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8025 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8026 int total = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8027
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8028 if (dyn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8029 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8030 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8032 total += Dynarr_memory_usage (dyn, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8033 for (i = 0; i < Dynarr_largest (dyn); i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8034 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8035 total +=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8036 compute_display_block_dynarr_usage (Dynarr_at (dyn, i).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8037 display_blocks, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8038 total +=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8039 compute_glyph_block_dynarr_usage (Dynarr_at (dyn, i).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8040 left_glyphs, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8041 total +=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8042 compute_glyph_block_dynarr_usage (Dynarr_at (dyn, i).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8043 right_glyphs, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8044 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8045 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8047 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8048 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8049
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8050 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8051 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8052 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8053 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8054 int total = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8055
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8056 if (dyn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8057 total += Dynarr_memory_usage (dyn, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8058
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8059 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8060 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8061
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8062 #endif /* MEMORY_USAGE_STATS */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8063
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8064
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8065 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8066 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8067 /* initialization */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8068 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8069 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8070
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8071 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8072 init_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8073 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8074 disable_preemption = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8075 preemption_count = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8076 max_preempts = INIT_MAX_PREEMPTS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8077
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8078 if (!initialized)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8079 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8080 cmotion_display_lines = Dynarr_new (struct display_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8081 mode_spec_bufbyte_string = Dynarr_new (Bufbyte);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8082 formatted_string_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8083 formatted_string_extent_dynarr = Dynarr_new (struct extent *);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8084 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8085 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8086 internal_cache = Dynarr_new (struct line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8087 memset (&formatted_string_display_line, 0, sizeof (struct display_line));
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 /* window system is nil when in -batch mode */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8091 if (!initialized || noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8092 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8093
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8094 /* If the user wants to use a window system, we shouldn't bother
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8095 initializing the terminal. This is especially important when the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8096 terminal is so dumb that emacs gives up before and doesn't bother
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8097 using the window system.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8099 If the DISPLAY environment variable is set, try to use X, and die
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8100 with an error message if that doesn't work. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8102 #ifdef HAVE_X_WINDOWS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8103 if (!strcmp (display_use, "x"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8104 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8105 /* Some stuff checks this way early. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8106 Vwindow_system = Qx;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8107 Vinitial_window_system = Qx;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8108 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8109 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8110 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8111 #ifdef HAVE_NEXTSTEP
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8112 if (!strcmp (display_use, "ns"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8114 Vwindow_system = Qns;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8115 Vinitial_window_system = Qns;
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 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8120 /* If no window system has been specified, try to use the terminal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8121 if (!isatty (0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8122 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8123 stderr_out ("XEmacs: standard input is not a tty\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8124 exit (1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8125 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8126
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8127 /* Look at the TERM variable */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8128 if (!getenv ("TERM"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8129 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8130 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8131 exit (1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8132 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8133
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8134 Vinitial_window_system = Qtty;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8135 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8136
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8137 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8138 syms_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8139 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8140 defsymbol (&Qcursor_in_echo_area, "cursor-in-echo-area");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8141 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8142 defsymbol (&Qpre_redisplay_hook, "pre-redisplay-hook");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8143 defsymbol (&Qpost_redisplay_hook, "post-redisplay-hook");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8144 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8145 defsymbol (&Qdisplay_warning_buffer, "display-warning-buffer");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8146 defsymbol (&Qbar_cursor, "bar-cursor");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8147 defsymbol (&Qwindow_scroll_functions, "window-scroll-functions");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8148 defsymbol (&Qredisplay_end_trigger_functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8149 "redisplay-end-trigger-functions");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8150
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8151 DEFSUBR (Fredisplay_echo_area);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8152 DEFSUBR (Fredraw_frame);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8153 DEFSUBR (Fredisplay_frame);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8154 DEFSUBR (Fredraw_device);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8155 DEFSUBR (Fredisplay_device);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8156 DEFSUBR (Fredraw_modeline);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 16
diff changeset
8157 DEFSUBR (Fforce_cursor_redisplay);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8158 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8159
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8160 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8161 vars_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8162 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8163 #if 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8164 staticpro (&last_arrow_position);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8165 staticpro (&last_arrow_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8166 last_arrow_position = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8167 last_arrow_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8168 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8169
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8170 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8172 /* #### Probably temporary */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8173 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8174 (Temporary) Setting this will impact the performance of the internal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8175 line start cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8176 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8177 cache_adjustment = 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8179 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8180 Minimum pixel height for clipped bottom display line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8181 A clipped line shorter than this won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8182 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8183 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8184 vertical_clip = 5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8186 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8187 Minimum visible area for clipped glyphs at right boundary.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8188 Clipped glyphs shorter than this won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8189 Only pixmap glyph instances are currently allowed to be clipped.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8190 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8191 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8192 horizontal_clip = 5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8194 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8195 String displayed by modeline-format's \"%m\" specification.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8196 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8197 Vglobal_mode_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8198
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8199 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8200 Marker for where to display an arrow on top of the buffer text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8201 This must be the beginning of a line in order to work.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8202 See also `overlay-arrow-string'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8203 */ , redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8204 Voverlay_arrow_position = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8205
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8206 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8207 String to display as an arrow. See also `overlay-arrow-position'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8208 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8209 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8210 Voverlay_arrow_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8211
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8212 DEFVAR_INT ("scroll-step", &scroll_step /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8213 *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
8214 If that fails to bring point back on frame, point is centered instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8215 If this is zero, point is always centered after it moves off screen.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8216 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8217
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8218 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8219 &truncate_partial_width_windows /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8220 *Non-nil means truncate lines in all windows less than full frame wide.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8221 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8222 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8223 truncate_partial_width_windows = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8225 DEFVAR_BOOL ("visible-bell", &visible_bell /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8226 *Non-nil means try to flash the frame to represent a bell.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8227 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8228 visible_bell = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8230 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8231 *Non-nil means no need to redraw entire frame after suspending.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8232 A non-nil value is useful if the terminal can automatically preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8233 Emacs's frame display when you reenter Emacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8234 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
8235 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8236 no_redraw_on_reenter = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8237
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
8238 /* #### This should be removed in 19.14 */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8239 DEFVAR_LISP ("window-system", &Vwindow_system /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8240 A symbol naming the window-system under which Emacs is running,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8241 such as `x', or nil if emacs is running on an ordinary terminal.
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 56
diff changeset
8242 This variable is OBSOLETE and will be removed in a future version.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8243 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8244 Vwindow_system = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8245
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8246 /* #### Temporary shit until window-system is eliminated. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8247 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8248 DON'T TOUCH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8249 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8250 Vinitial_window_system = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8251
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8252 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8253 Non-nil means put cursor in minibuffer, at end of any message there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8254 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8255 cursor_in_echo_area = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8256
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8257 /* #### Shouldn't this be generalized as follows:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8259 if nil, use block cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8260 if a number, use a bar cursor of that width.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8261 Otherwise, use a 1-pixel bar cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8263 #### Or better yet, this variable should be trashed entirely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8264 (use a Lisp-magic variable to maintain compatibility)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8265 and a specifier `cursor-shape' added, which allows a block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8266 cursor, a bar cursor, a flashing block or bar cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8267 maybe a caret cursor, etc. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8268
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8269 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8270 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
8271 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8272 Vbar_cursor = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8273
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8274 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8275 xxDEFVAR_LISP ("pre-redisplay-hook", &Vpre_redisplay_hook /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8276 Function or functions to run before every redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8277 Functions on this hook must be careful to avoid signalling errors!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8278 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8279 Vpre_redisplay_hook = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8280
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8281 xxDEFVAR_LISP ("post-redisplay-hook", &Vpost_redisplay_hook /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8282 Function or functions to run after every redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8283 Functions on this hook must be careful to avoid signalling errors!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8284 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8285 Vpost_redisplay_hook = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8286 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8288 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8289 Bump this to tell the C code to call `display-warning-buffer'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8290 at next redisplay. You should not normally change this; the function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8291 `display-warning' automatically does this at appropriate times.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8292 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8293 display_warning_tick = 0;
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 ("inhibit-warning-display", &inhibit_warning_display /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8296 Non-nil means inhibit display of warning messages.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8297 You should *bind* this, not set it. Any pending warning messages
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8298 will be displayed when the binding no longer applies.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8299 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8300 /* reset to 0 by startup.el after the splash screen has displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8301 This way, the warnings don't obliterate the splash screen. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8302 inhibit_warning_display = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8303
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8304 DEFVAR_LISP ("window-size-change-functions",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8305 &Vwindow_size_change_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8306 Not currently implemented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8307 Functions called before redisplay, if window sizes have changed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8308 The value should be a list of functions that take one argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8309 Just before redisplay, for each frame, if any of its windows have changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8310 size since the last redisplay, or have been split or deleted,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8311 all the functions in the list are called, with the frame as argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8312 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8313 Vwindow_size_change_functions = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8314
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8315 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8316 Not currently implemented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8317 Functions to call before redisplaying a window with scrolling.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8318 Each function is called with two arguments, the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8319 and its new display-start position. Note that the value of `window-end'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8320 is not valid when these functions are called.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8321 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8322 Vwindow_scroll_functions = 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 DEFVAR_LISP ("redisplay-end-trigger-functions",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8325 &Vredisplay_end_trigger_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8326 See `set-window-redisplay-end-trigger'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8327 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8328 Vredisplay_end_trigger_functions = Qnil;
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8329
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8330 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8331 Non-nil means column display number starts at 1.
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8332 */ );
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8333 column_number_start_at_one = 1;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8334 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8336 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8337 specifier_vars_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8338 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8339 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8340 *Width of left margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8341 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8342 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8343 Vleft_margin_width = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8344 set_specifier_fallback
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8345 (Vleft_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8346 list1 (Fcons (Qnil, Qzero)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8347 set_specifier_caching (Vleft_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8348 slot_offset (struct window, left_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8349 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8350 slot_offset (struct frame, left_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8351 margin_width_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8352
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8353 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8354 *Width of right margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8355 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8356 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8357 Vright_margin_width = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8358 set_specifier_fallback
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8359 (Vright_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8360 list1 (Fcons (Qnil, Qzero)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8361 set_specifier_caching (Vright_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8362 slot_offset (struct window, right_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8363 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8364 slot_offset (struct frame, right_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8365 margin_width_changed_in_frame);
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_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8368 *Minimum ascent height of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8369 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8370 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8371 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8372 set_specifier_fallback (Vminimum_line_ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8373 list1 (Fcons (Qnil, Qzero)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8374 set_specifier_caching (Vminimum_line_ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8375 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8376 minimum_line_ascent),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8377 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8378 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8379
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8380 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8381 *Minimum descent height of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8382 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8383 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8384 Vminimum_line_descent = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8385 set_specifier_fallback (Vminimum_line_descent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8386 list1 (Fcons (Qnil, Qzero)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8387 set_specifier_caching (Vminimum_line_descent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8388 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8389 minimum_line_descent),
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 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8392
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8393 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8394 *Non-nil means use the left outside margin as extra whitespace when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8395 displaying 'whitespace or 'inside-margin glyphs.
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 Vuse_left_overflow = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8399 set_specifier_fallback (Vuse_left_overflow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8400 list1 (Fcons (Qnil, Qnil)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8401 set_specifier_caching (Vuse_left_overflow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8402 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8403 use_left_overflow),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8404 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8405 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8407 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8408 *Non-nil means use the right outside margin as extra whitespace when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8409 displaying 'whitespace or 'inside-margin glyphs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8410 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8411 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8412 Vuse_right_overflow = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8413 set_specifier_fallback (Vuse_right_overflow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8414 list1 (Fcons (Qnil, Qnil)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8415 set_specifier_caching (Vuse_right_overflow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8416 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8417 use_right_overflow),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8418 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8419 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8420
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8421 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8422 *Non-nil means the text cursor is visible (this is usually the case).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8423 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8424 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8425 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8426 set_specifier_fallback (Vtext_cursor_visible_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8427 list1 (Fcons (Qnil, Qt)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8428 set_specifier_caching (Vtext_cursor_visible_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8429 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8430 text_cursor_visible_p),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8431 text_cursor_visible_p_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8432 0, 0);
72
b9518feda344 Import from CVS: tag r20-0b31
cvs
parents: 70
diff changeset
8433
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8434 }