annotate src/redisplay.c @ 10:49a24b4fd526 r19-15b6

Import from CVS: tag r19-15b6
author cvs
date Mon, 13 Aug 2007 08:47:52 +0200
parents b82b59fe008d
children 0293115a14e9
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 /* Note: We have to be careful throughout this code to properly handle
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 and differentiate between Bufbytes and Emchars.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 Since strings are generally composed of Bufbytes, I've taken the tack
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 that any contiguous set of Bufbytes is called a "string", while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 any contiguous set of Emchars is called an "array". */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 /* Return value to indicate a failure by an add_*_rune routine to add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 a rune, but no propagation information needs to be returned. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 #define ADD_FAILED (prop_block_dynarr *) 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 #define BEGIN_GLYPHS 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 #define END_GLYPHS 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 #define LEFT_GLYPHS 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 #define RIGHT_GLYPHS 3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 /* Set the vertical clip to 0 if we are currently updating the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 start cache. Otherwise for buffers of line height 1 it may fail to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 be able to work properly because regenerate_window will not layout
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 a single line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 #define VERTICAL_CLIP(w, display) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 (updating_line_start_cache \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 ? 0 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 : ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 ? INT_MAX \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 : vertical_clip))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 /* The following structures are completely private to redisplay.c so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 we put them here instead of in a header file, for modularity. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 /* NOTE: Bytinds not Bufpos's in this structure. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 typedef struct position_redisplay_data_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 /* This information is normally filled in by the create_*_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 routines and is used by the add_*_rune routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 Emchar ch; /* Character that is to be added. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 used to communicate this information to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 add_emchar_rune(). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 Lisp_Object last_charset; /* The charset of the previous character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 Used to optimize some lookups -- we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 only have to do some things when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 the charset changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 int last_char_width; /* The width of the previous character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 int font_is_bogus; /* If true, it means we couldn't instantiate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 the font for this charset, so we substitute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 ~'s from the ASCII charset. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 Bytind bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 Bytind bi_endpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 int pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 int max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 int blank_width; /* Width of the blank that is to be added.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 This is used to communicate this information
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 to add_blank_rune().
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 This is also used rather cheesily to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 communicate the width of the eol-cursor-size
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 blank that exists at the end of the line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 add_emchar_rune() is called cheesily with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 the non-printing char '\n', which is stuck
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 in the output routines with its width being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 BLANK_WIDTH. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 Bytind bi_cursor_bufpos;/* This stores the buffer position of the cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 unsigned int cursor_type :3;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 int cursor_x; /* rune block cursor is at */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 int start_col; /* Number of character columns (each column has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 a width of the default char width) that still
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 need to be skipped. This is used for horizontal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 scrolling, where a certain number of columns
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 (those off the left side of the screen) need
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 to be skipped before anything is displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 Bytind bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 /* Information about the face the text should be displayed in and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 any begin-glyphs and end-glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 struct extent_fragment *ef;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 face_index findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 /* 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
143 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
144 line ascent and descent values end up being, based just on font
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 information. In the first case we can immediately update the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 values, thus their inclusion here. In the last case we cannot
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 determine the actual contribution to the line height until we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 have finished laying out all text on the line. Thus we propagate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 the max height of such pixmaps and do a final calculation after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 all text has been added to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 int new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 int new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 int max_pixmap_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 Lisp_Object result_str; /* String where we put the result of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 generating a formatted string in the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 int is_modeline; /* Non-zero if we're generating the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 Charcount modeline_charpos; /* Number of chars used in result_str so far;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 corresponds to bytepos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 Bytecount bytepos; /* Number of bytes used in result_str so far.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 We don't actually copy the bytes into result_str
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 until the end because we don't know how big the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 string is going to be until then. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 } pos_data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 enum prop_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 PROP_STRING,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 PROP_CHAR,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 PROP_MINIBUF_PROMPT,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 PROP_BLANK
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 /* Data that should be propagated to the next line. Either a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 Emchar or a string of Bufbyte's.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 The actual data that is propagated ends up as a Dynarr of these
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 blocks.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 #### It's unclean that both Emchars and Bufbytes are here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 struct prop_block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 enum prop_type type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 union data
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 struct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 Bufbyte *str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 Bytecount len; /* length of the string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 } p_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 struct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 Emchar ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 Bytind bi_cursor_bufpos; /* NOTE: is in Bytinds */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 unsigned int cursor_type :3;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 } p_char;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 struct
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 face_index findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 } p_blank;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 } data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 typedef struct prop_block_dynarr_type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 Dynarr_declare (struct prop_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 } prop_block_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 * Prototypes for all functions defined in redisplay.c.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 struct display_block *get_display_block_from_line (struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 enum display_type type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 layout_bounds calculate_display_line_boundaries (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 int modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 static Bufpos generate_display_line (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 int bounds, Bufpos start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 int start_col, prop_block_dynarr **prop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 static void generate_modeline (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 static int ensure_modeline_generated (struct window *w, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 static void generate_formatted_string_db (Lisp_Object format_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 Lisp_Object result_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 face_index findex, int min_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 int max_pixpos, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 Charcount pos, Charcount min_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 Charcount max_pos, Lisp_Object elt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 int depth, int max_pixsize,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 face_index findex, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 static prop_block_dynarr *add_emchar_rune (pos_data *data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 static prop_block_dynarr *add_bufbyte_string_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 Bufbyte *c_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 Bytecount c_length,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 int no_prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 static prop_block_dynarr *add_blank_rune (pos_data *data, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 int char_tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 static prop_block_dynarr *add_octal_runes (pos_data *data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 static prop_block_dynarr *add_control_char_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 struct buffer *b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 static prop_block_dynarr *add_disp_table_entry_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 Lisp_Object entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 static prop_block_dynarr *add_propagation_runes (prop_block_dynarr **prop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 pos_data *data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 static prop_block_dynarr *add_glyph_rune (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 struct glyph_block *gb,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 int pos_type, int allow_cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 struct glyph_cachel *cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 static prop_block_dynarr *add_glyph_runes (pos_data *data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 int pos_type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 /* NOTE: Bytinds not Bufpos's here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 static Bytind create_text_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 Bytind bi_start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 prop_block_dynarr **prop, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 static int create_overlay_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 static void create_left_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 int overlay_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 static void create_right_glyph_block (struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 static void regenerate_window (struct window *w, Bufpos start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 Bufpos point, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 static void regenerate_window_point_center (struct window *w, Bufpos point,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 int window_half_pixpos (struct window *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 int line_at_center (struct window *w, int type, Bufpos start, Bufpos point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 Bufpos point_at_center (struct window *w, int type, Bufpos start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 Bufpos point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 static void redisplay_window (Lisp_Object window, int skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 static void redisplay_windows (Lisp_Object window, int skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 static int redisplay_frame (struct frame *f, int preemption_check);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 void redisplay (void);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 static void decode_mode_spec (struct window *w, Emchar spec, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 static void free_display_line (struct display_line *dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 void free_display_structs (struct window_mirror *mir);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 static int point_visible (struct window *w, Bufpos point, int type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 static void update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 Bufpos point, int no_regen);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 static Bufpos line_start_cache_start (struct window *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 static Bufpos line_start_cache_end (struct window *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 /* This used to be 10 but 30 seems to give much better performance. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 #define INIT_MAX_PREEMPTS 30
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 static int max_preempts;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 #define REDISPLAY_PREEMPTION_CHECK \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 preempted = 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 if (!disable_preemption && \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro))) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 if (!INTERACTIVE || detect_input_pending ()) { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 preempted = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 * Redisplay global variables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 /* We need a third set of display structures for the cursor motion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 routines. We used to just give each window a third set. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 we always fully regenerate the structures when needed so there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 isn't any reason we need more than a single set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 display_line_dynarr *cmotion_display_lines;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 /* Used by generate_formatted_string. Global because they get used so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 much that the dynamic allocation time adds up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 emchar_dynarr *formatted_string_emchar_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 struct display_line formatted_string_display_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 /* 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
323 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
324 this way rather than adding them as we generate the string because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 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
326 (to avoid having to resize the string multiple times), and we don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 want to go around adding extents to a string when the extents might
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 stretch off the end of the string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 extent_dynarr *formatted_string_extent_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 bytecount_dynarr *formatted_string_extent_start_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 bytecount_dynarr *formatted_string_extent_end_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 /* #### probably temporary */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 int cache_adjustment;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 /* This holds a string representing the text corresponding to a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 modeline % spec. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 static bufbyte_dynarr *mode_spec_bufbyte_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 int in_display; /* 1 if in redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 int disable_preemption; /* Used for debugging redisplay and for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 force-redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 /* We only allow max_preempts preemptions before we force a redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 static int preemption_count;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 /* Minimum pixel height of clipped bottom display line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 int vertical_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 /* Minimum visible pixel width of clipped glyphs at right margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 int horizontal_clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 /* Set if currently inside update_line_start_cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 int updating_line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 /* Nonzero means reading single-character input with prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 so put cursor on minibuffer after the prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 int cursor_in_echo_area;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 Lisp_Object Qcursor_in_echo_area;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363 /* Nonzero means truncate lines in all windows less wide than the frame */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 int truncate_partial_width_windows;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 /* non-nil if a buffer has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 int buffers_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 int buffers_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 /* non-nil if hscroll has changed somewhere or a buffer has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 narrowed or widened */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 int clip_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 int clip_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 /* non-nil if any extent has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 int extents_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 int extents_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 /* non-nil if any face has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 int faces_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 /* Nonzero means some frames have been marked as garbaged */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 int frame_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 /* This variable is 1 if the icon has to be updated.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 It is set to 1 when `frame-icon-glyph' changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 int icon_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 int icon_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 /* This variable is 1 if the menubar widget has to be updated.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 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
392 has been indapted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 /* indapted???? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 int menubar_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 int menubar_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 /* true iff we should redraw the modelines on the next redisplay */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 int modeline_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 int modeline_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 /* non-nil if point has changed in some buffer since the last time
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 int point_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 int point_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 /* non-nil if some frame has changed its size */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 int size_changed;
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 some device has signaled that it wants to change size */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 int asynch_device_change_pending;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 /* non-nil if any toolbar has changed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 int toolbar_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 int toolbar_changed_set;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 /* non-nil if any window has changed since the last time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 int windows_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
419 /* 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
420 time redisplay completed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 int windows_structure_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 /* If non-nil, use vertical bar cursor. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 Lisp_Object Vbar_cursor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 Lisp_Object Qbar_cursor;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 int visible_bell; /* If true and the terminal will support it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 then the frame will flash instead of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 beeping when an error occurs */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 /* Nonzero means no need to redraw the entire frame on resuming
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 a suspended Emacs. This is useful on terminals with multiple pages,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 where one page is used for Emacs and another for all else. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 int no_redraw_on_reenter;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 under which emacs is running
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 ('x is the only current possibility) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 Lisp_Object Vinitial_window_system;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 Lisp_Object Vglobal_mode_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 /* The number of lines to try scrolling a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 window by when point leaves the window; if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 it is <=0 then point is centered in the window */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 int scroll_step;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 /* Marker for where to display an arrow on top of the buffer text. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 Lisp_Object Voverlay_arrow_position;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 /* String to display for the arrow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 Lisp_Object Voverlay_arrow_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 Lisp_Object Vwindow_size_change_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 Lisp_Object Qredisplay_end_trigger_functions, Vredisplay_end_trigger_functions;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 #define INHIBIT_REDISPLAY_HOOKS /* #### Until we've thought about
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 this more. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 /* #### Chuck says: I think this needs more thought.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 Think about this for 19.14. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 int last_display_warning_tick, display_warning_tick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 Lisp_Object Qdisplay_warning_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 int inhibit_warning_display;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 Lisp_Object Vleft_margin_width, Vright_margin_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 Lisp_Object Vtext_cursor_visible_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
476 int column_number_start_at_one;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 /* low-level interfaces onto device routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 redisplay_text_width_emchar_string (struct window *w, int findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 Emchar *str, Charcount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 unsigned char charsets[NUM_LEADING_BYTES];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 find_charsets_in_emchar_string (charsets, str, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 charsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 text_width, (WINDOW_FACE_CACHEL (w, findex),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 str, len));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 static emchar_dynarr *rtw_emchar_dynarr;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 redisplay_text_width_string (struct window *w, int findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 Bytecount offset, Bytecount 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 if (!rtw_emchar_dynarr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 rtw_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 Dynarr_reset (rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 fixup_internal_substring (nonreloc, reloc, offset, &len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 if (STRINGP (reloc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 nonreloc = string_data (XSTRING (reloc));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 return redisplay_text_width_emchar_string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 (w, findex, Dynarr_atp (rtw_emchar_dynarr, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 Dynarr_length (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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 Bufbyte *nonreloc, Lisp_Object reloc,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 Bytecount offset, Bytecount len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 unsigned char charsets[NUM_LEADING_BYTES];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 Lisp_Object frame = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 struct face_cachel cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 if (!rtw_emchar_dynarr)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 rtw_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 Dynarr_reset (rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 fixup_internal_substring (nonreloc, reloc, offset, &len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 if (STRINGP (reloc))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 nonreloc = string_data (XSTRING (reloc));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 convert_bufbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 find_charsets_in_bufbyte_string (charsets, nonreloc, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 reset_face_cachel (&cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 cachel.face = face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 XSETFRAME (frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 ensure_face_cachel_complete (&cachel, frame, charsets);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 text_width, (&cachel, Dynarr_atp (rtw_emchar_dynarr, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 Dynarr_length (rtw_emchar_dynarr)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 /* Return the display block from DL of the given TYPE. A display line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 can have only one display block of each possible type. If DL does
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 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
550
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 struct display_block *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 get_display_block_from_line (struct display_line *dl, enum display_type type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 struct display_block db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 /* 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
558 if so, return it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 if (Dynarr_at (dl->display_blocks, elt).type == type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 return (Dynarr_atp (dl->display_blocks, elt));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 /* There isn't an active block of the desired type, but there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 might still be allocated blocks we need to reuse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 if (elt < Dynarr_largest (dl->display_blocks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 /* 'add' the block to the list */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 Dynarr_increment (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 /* initialize and return */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 dbp->type = type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 return dbp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 /* This line doesn't have any display blocks, so initialize the display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 bock array. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 dl->display_blocks = Dynarr_new (struct display_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 /* 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
589 one and add it to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 memset (&db, 0, sizeof (struct display_block));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 db.type = type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 db.runes = Dynarr_new (struct rune);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 Dynarr_add (dl->display_blocks, db);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 /* Return the newly added display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 elt = Dynarr_length (dl->display_blocks) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 return Dynarr_atp (dl->display_blocks, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 tab_char_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 int char_tab_width = XINT (b->tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 return char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 space_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 /* While tabs are traditional composed of spaces, for variable-width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 fonts the space character tends to give too narrow a value. So
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 we use 'n' instead. Except that we don't. We use the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 character width for the default face. If this is actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 defined by the font then it is probably the best thing to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 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
621 already calculated its width. Thus we can avoid a call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 XTextWidth on X frames by just querying the default width. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 return XFONT_INSTANCE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 tab_pix_width (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 return (space_width (w) * tab_char_width (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 /* Given a pixel position in a window, return the pixel location of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 the next tabstop. Tabs are calculated from the left window edge in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 terms of spaces displayed in the default face. Formerly the space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 width was determined using the currently active face. That method
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 leads to tabstops which do not line up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 int n_pos = left_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 int pix_tab_width = tab_pix_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 /* Adjust n_pos for any hscrolling which has happened. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 if (w->hscroll > 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 n_pos -= space_width (w) * (w->hscroll - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 while (n_pos <= start_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 n_pos += pix_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 return n_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 /* For the given window, calculate the outside and margin boundaries for a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 display line. The whitespace boundaries must be calculated by the text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 layout routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 layout_bounds
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 calculate_display_line_boundaries (struct window *w, int modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 layout_bounds bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 /* Set the outermost boundaries which are the boundaries of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 window itself minus the gutters (and minus the scrollbars if this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 is for the modeline). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 if (!modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 bounds.left_out = WINDOW_TEXT_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 bounds.right_out = WINDOW_TEXT_RIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 bounds.left_out = WINDOW_MODELINE_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 /* The inner boundaries mark where the glyph margins are located. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 bounds.left_in = bounds.left_out + window_left_margin_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 bounds.right_in = bounds.right_out - window_right_margin_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 /* We cannot fully calculate the whitespace boundaries as they
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 depend on the contents of the line being displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 bounds.left_white = bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 bounds.right_white = bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 return bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 /* Given a display line and a starting position, ensure that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 contents of the display line accurately represent the visual
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 representation of the buffer contents starting from the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 position when displayed in the given window. The display line ends
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 when the contents of the line reach the right boundary of the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 generate_display_line (struct window *w, struct display_line *dl, int bounds,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 Bufpos start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 prop_block_dynarr **prop, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 Bufpos ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 int overlay_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 /* If our caller hasn't already set the boundaries, then do so now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 if (!bounds)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 dl->bounds = calculate_display_line_boundaries (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 /* Reset what this line is using. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 Dynarr_reset (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 if (dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 Dynarr_free (dl->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 dl->left_glyphs = 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 if (dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 Dynarr_free (dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 dl->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 /* We aren't generating a modeline at the moment. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 dl->modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 /* Create a display block for the text region of the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 /* #### urk urk urk!!! Chuck fix this shit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 Bytind hacked_up_bytind =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 create_text_block (w, dl, bufpos_to_bytind (b, start_pos),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 start_col, prop, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 if (hacked_up_bytind > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 ret_bufpos = BUF_ZV (b) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 ret_bufpos = bytind_to_bufpos (b, hacked_up_bytind);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 dl->bufpos = start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 if (dl->end_bufpos < dl->bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740 dl->end_bufpos = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 if (MARKERP (Voverlay_arrow_position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 && start_pos == marker_position (Voverlay_arrow_position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 && (STRINGP (Voverlay_arrow_string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 || GLYPHP (Voverlay_arrow_string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 overlay_width = create_overlay_glyph_block (w, dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 overlay_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 /* If there are left glyphs associated with any character in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 text block, then create a display block to handle them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756 create_left_glyph_block (w, dl, overlay_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 /* If there are right glyphs associated with any character in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759 text block, then create a display block to handle them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 create_right_glyph_block (w, dl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 /* In the future additional types of display blocks may be generated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 w->last_redisplay_pos = ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 return ret_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 /* Adds an hscroll glyph to a display block. If this is called, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 the block had better be empty.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 Yes, there are multiple places where this function is called but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 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
776 with bi_start_col_enabled a little differently depending on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 object being worked with. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 add_hscroll_rune (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 Bytind bi_old_bufpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 if (data->cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789 && data->bi_cursor_bufpos >= data->bi_start_col_enabled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 && data->bi_cursor_bufpos <= data->bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 data->bi_cursor_bufpos = data->bi_start_col_enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 data->bi_endpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 data->bi_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 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 gb.glyph = Vhscroll_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 GLYPH_CACHEL (XWINDOW (data->window),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 HSCROLL_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 data->bi_endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 data->bi_bufpos = bi_old_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 data->bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 /* Adds a character rune to a display block. If there is not enough
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 room to fit the rune on the display block (as determined by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 MAX_PIXPOS) then it adds nothing and returns ADD_FAILED. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 add_emchar_rune (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 struct rune rb, *crb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 int width, local;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 return add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 if (data->ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 data->font_is_bogus = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 /* Cheesy end-of-line pseudo-character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 Lisp_Object charset = CHAR_CHARSET (data->ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 if (!EQ (charset, data->last_charset))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 /* OK, we need to do things the hard way. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 Lisp_Object font_instance =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 ensure_face_cachel_contains_charset (cachel, data->window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 charset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 struct Lisp_Font_Instance *fi;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 if (EQ (font_instance, Vthe_null_font_instance))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 data->font_is_bogus = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 data->font_is_bogus = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 fi = XFONT_INSTANCE (font_instance);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 if (!fi->proportional_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 /* sweetness and light. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 data->last_char_width = fi->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 data->last_char_width = -1;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
873 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 data->new_descent = max (data->new_descent, (int) fi->descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 width = data->last_char_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 if (width < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 /* bummer. Proportional fonts. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 width = redisplay_text_width_emchar_string (XWINDOW (data->window),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 data->findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 &data->ch, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 local = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 crb = &rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 local = 1;
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 crb->findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 crb->xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 crb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 if (data->bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 struct buffer *buf = XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 crb->bufpos = bytind_to_bufpos (buf, data->bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 else if (data->is_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 crb->bufpos = data->modeline_charpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 /* fuckme if this shouldn't be an abort. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 /* abort (); fuckme harder, this abort gets tripped quite often,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 in propagation and whatnot. #### fixme */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 crb->bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 crb->type = RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 crb->endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 crb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 crb->cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 crb->cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 else if (data->cursor_type == IGNORE_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 crb->cursor_type = IGNORE_CURSOR;
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 if (local)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 Dynarr_add (data->db->runes, *crb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 Dynarr_increment (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 data->pixpos += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 /* Given a string C_STRING of length C_LENGTH, call add_emchar_rune
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 for each character in the string. Propagate any left-over data
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 unless NO_PROP is non-zero. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 add_bufbyte_string_runes (pos_data *data, Bufbyte *c_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 Bytecount c_length, int no_prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 Bufbyte *pos, *end = c_string + c_length;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 /* #### This function is too simplistic. It needs to do the same
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 sort of character interpretation (display-table lookup,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 ctl-arrow checking), etc. that create_text_block() does.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 The functionality to do this in that routine needs to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 modularized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 for (pos = c_string; pos < end;)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 data->ch = charptr_emchar (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 if (no_prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 Bytecount len = end - pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 prop = Dynarr_new (struct prop_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 pb.type = PROP_STRING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 pb.data.p_string.str =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 (Bufbyte *) xmalloc (sizeof (Bufbyte) * len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 pb.data.p_string.len = len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 INC_CHARPTR (pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 assert (pos <= end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 /* Add a single rune of the specified width. The area covered by this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 rune will be displayed in the foreground color of the associated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 /* 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
1013 been to add it as a tab. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 /* assert (w != NULL) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 /* If we have still not fully scrolled horizontally, subtract
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 the width of this tab and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 if (char_tab_width < data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 data->start_col -= char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 else if (char_tab_width == data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 data->blank_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 int spcwid = space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 if (spcwid >= data->blank_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 data->blank_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 data->blank_width -= spcwid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 data->start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041 /* Could be caused by the handling of the hscroll rune. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 if (retval != NULL || !data->blank_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 /* Blank runes are always calculated to fit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 assert (data->pixpos + data->blank_width <= data->max_pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 rb.findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 rb.xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 rb.width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 if (data->bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 struct buffer *buf = XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 rb.bufpos = bytind_to_bufpos (buf, data->bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 /* #### and this is really correct too? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 rb.bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 rb.type = RUNE_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 Dynarr_add (data->db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 data->pixpos += data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 /* Add runes representing a character in octal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 if (add_failed || (add_failed = add_emchar_rune (data))) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 struct prop_block pb; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 if (!prop) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 prop = Dynarr_new (struct prop_block); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 pb.type = PROP_CHAR; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 pb.data.p_char.ch = data->ch; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 pb.data.p_char.cursor_type = data->cursor_type; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 Dynarr_add (prop, pb); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 add_octal_runes (pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 prop_block_dynarr *prop, *add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 Emchar orig_char = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 unsigned int orig_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 /* Initialize */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 add_failed = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 if (!data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 add_failed = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 gb.glyph = Voctal_escape_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 add_failed =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 /* We only propagate information if the glyph was partially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 added. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 return add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145 if (data->ch >= 0x100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 /* If the character is an extended Mule character, it could have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 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
1149 octal number. This is not that pretty, but whatever. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 data->ch = (7 & (orig_char >> 18)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 data->ch = (7 & (orig_char >> 15)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 data->ch = (7 & (orig_char >> 12)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 data->ch = (7 & (orig_char >> 9)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 data->ch = (7 & (orig_char >> 6)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 data->ch = (7 & (orig_char >> 3)) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 data->ch = (7 & orig_char) + '0';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 ADD_NEXT_OCTAL_RUNE_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 data->cursor_type = orig_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 #undef ADD_NEXT_OCTAL_RUNE_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 /* Add runes representing a control character to a display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 add_control_char_runes (pos_data *data, struct buffer *b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 if (!NILP (b->ctl_arrow))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 Emchar orig_char = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189 /* Initialize */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 if (!data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197 if (data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 if (retval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 gb.glyph = Vcontrol_arrow_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 /* We only propagate information if the glyph was partially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 added. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 if (orig_char == 0177)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 data->ch = '?';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 data->ch = orig_char ^ 0100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 if (add_emchar_rune (data))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 if (!prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 prop = Dynarr_new (struct prop_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 pb.type = PROP_CHAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 pb.data.p_char.ch = data->ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 pb.data.p_char.cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 return add_octal_runes (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 /* Given a display table entry, call the appropriate functions to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 display each element of the entry. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 if (VECTORP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 struct Lisp_Vector *de = XVECTOR (entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 long len = vector_length (de);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 for (elt = 0; elt < len; elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 if (NILP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 else if (STRINGP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 prop =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 add_bufbyte_string_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 (data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 string_data (XSTRING (de->contents[elt])),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 string_length (XSTRING (de->contents[elt])),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 else if (GLYPHP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280 if (!data->start_col && data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282 prop = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 gb.glyph = de->contents[elt];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 else if (CHAR_OR_CHAR_INTP (de->contents[elt]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 data->ch = XCHAR_OR_CHAR_INT (de->contents[elt]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298 /* Else blow it off because someone added a bad entry and we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299 don't have any safe way of signaling an error. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 /* #### Still need to add any remaining elements to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302 propagation information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 else if (STRINGP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 prop = add_bufbyte_string_runes (data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 string_data (XSTRING (entry)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 string_length (XSTRING (entry)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314 else if (GLYPHP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 data->start_col--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 if (!data->start_col && data->bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 prop = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 gb.glyph = entry;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 else if (CHAR_OR_CHAR_INTP (entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334 data->ch = XCHAR_OR_CHAR_INT (entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335 prop = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338 /* 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
1339 have any safe way of signaling an error. Hey, this comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 sounds familiar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 /* Add runes which were propagated from the previous line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 /* #### Remember to handle start_col parameter of data when the rest of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 this is finished. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 /* #### Chuck -- I've redone this function a bit. It looked like the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 case of not all the propagation blocks being added was not handled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353 well. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 /* #### Chuck -- I also think the double indirection of PROP is kind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 of bogus. A cleaner solution is just to check for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 Dynarr_length (prop) > 0. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 /* #### This function also doesn't even pay attention to ADD_FAILED!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 This is seriously fucked! Seven ####'s in 130 lines -- is that a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 record? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 prop_block_dynarr *add_failed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 Bytind bi_old_cursor_bufpos = data->bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 unsigned int old_cursor_type = data->cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 for (elt = 0; elt < Dynarr_length (*prop); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 struct prop_block *pb = Dynarr_atp (*prop, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 switch (pb->type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 case PROP_CHAR:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 data->ch = pb->data.p_char.ch;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 data->bi_cursor_bufpos = pb->data.p_char.bi_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 data->cursor_type = pb->data.p_char.cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 add_failed = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 case PROP_STRING:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 if (pb->data.p_string.str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 xfree (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 /* #### bogus bogus -- this doesn't do anything!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 Should probably call add_bufbyte_string_runes(),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 once that function is fixed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 case PROP_MINIBUF_PROMPT:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 Bytind bi_old_bufpos = data->bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 data->findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 data->bi_bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 while (pb->data.p_string.len > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 data->ch = charptr_emchar (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 add_failed = add_emchar_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 if (add_failed)
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 = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 data->bi_bufpos = bi_old_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409 /* Complicated equivalent of ptr++, len-- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 Bufbyte *oldpos = pb->data.p_string.str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 INC_CHARPTR (pb->data.p_string.str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 /* ##### FIXME FIXME FIXME -- Upon successful return from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 this function, data->bi_bufpos is automatically incremented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 However, we don't want that to happen if we were adding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 the minibuffer prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422 struct buffer *buf =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 /* #### Chuck fix this shit or I'm gonna scream! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425 if (bi_old_bufpos > BI_BUF_BEGV (buf))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 data->bi_bufpos = prev_bytind (buf, bi_old_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 /* #### is this correct? Does anyone know?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429 Does anyone care? Is this a cheesy hack or what? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 data->bi_bufpos = BI_BUF_BEGV (buf) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 case PROP_BLANK:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 /* #### I think it's unnecessary and misleading to preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 the blank_width, as it implies that the value carries
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 over from one rune to the next, which is wrong. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 int old_width = data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 data->findex = pb->data.p_blank.findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 data->blank_width = pb->data.p_blank.width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 data->bi_cursor_bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 data->cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 if (data->pixpos + data->blank_width > data->max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 data->blank_width = data->max_pixpos - data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 /* We pass a bogus value of char_tab_width. It shouldn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 matter because unless something is really screwed up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 this call won't cause that arg to be used. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 /* This can happen in the case where we have a tab which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 is wider than the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 if (data->blank_width != pb->data.p_blank.width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 pb->data.p_blank.width -= data->blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 add_failed = ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 data->blank_width = old_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 if (add_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 goto oops_no_more_space;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 default:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 abort ();
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 oops_no_more_space:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 data->bi_cursor_bufpos = bi_old_cursor_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 data->cursor_type = old_cursor_type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 if (elt < Dynarr_length (*prop))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 Dynarr_delete_many (*prop, 0, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 return *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 /* Add 'text layout glyphs at position POS_TYPE that are contained to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 the display block, but add all other types to the appropriate list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493 of the display line. They will be added later by different
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 routines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 int allow_cursor, struct glyph_cachel *cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 struct window *w = XWINDOW (data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 /* A nil extent indicates a special glyph (ex. truncator). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503 if (NILP (gb->extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 || (pos_type == BEGIN_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 || (pos_type == END_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 int xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 int ascent, descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 Lisp_Object baseline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 if (cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 width = cachel->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 width = glyph_width (gb->glyph, Qnil, data->findex, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 if (!width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 if (data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 prop_block_dynarr *retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 int glyph_char_width = width / space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 /* If we still have not fully scrolled horizontally after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 taking into account the width of the glyph, subtract its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 width and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 if (glyph_char_width < data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 data->start_col -= glyph_char_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 else if (glyph_char_width == data->start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 xoffset = space_width (w) * data->start_col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 width -= xoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 /* #### Can this happen? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545 if (width < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 data->start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 retval = add_hscroll_rune (data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 /* Could be caused by the handling of the hscroll rune. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 if (retval != NULL || !width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 xoffset = 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 if (data->pixpos + width > data->max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 /* If this is the first object we are attempting to add to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 the line then we ignore the horizontal_clip threshold.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 Otherwise we will loop until the bottom of the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 continually failing to add this glyph because it is wider
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 than the window. We could alternatively just completely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 ignore the glyph and proceed from there but I think that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 this is a better solution. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 if (Dynarr_length (data->db->runes)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 && data->max_pixpos - data->pixpos < horizontal_clip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570 return ADD_FAILED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 width = data->max_pixpos - data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575 if (cachel)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577 ascent = cachel->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 descent = cachel->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 ascent = glyph_ascent (gb->glyph, Qnil, data->findex, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583 descent = glyph_descent (gb->glyph, Qnil, data->findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 baseline = glyph_baseline (gb->glyph, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 if (glyph_contrib_p (gb->glyph, data->window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 /* A pixmap that has not had a baseline explicitly set. Its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 contribution will be determined later. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 if (NILP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 data->max_pixmap_height = max (data->max_pixmap_height, height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599 /* A string so determine contribution normally. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 else if (EQ (baseline, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 data->new_ascent = max (data->new_ascent, ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 data->new_descent = max (data->new_descent, descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 /* A pixmap with an explicitly set baseline. We determine the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607 contribution here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 else if (INTP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 pix_ascent = height * XINT (baseline) / 100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 pix_descent = height - pix_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 data->new_ascent = max (data->new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 data->new_descent = max (data->new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620 /* Otherwise something is screwed up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 face = glyph_face (gb->glyph, data->window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626 if (NILP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 rb.findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 rb.findex = get_builtin_face_cache_index (w, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 rb.xpos = data->pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 rb.width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 rb.bufpos = 0; /* glyphs are never "at" anywhere */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 if (data->bi_endpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 /* #### is this necessary at all? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1637 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638 rb.endpos = bytind_to_bufpos (buf, data->bi_endpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 rb.type = RUNE_DGLYPH;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 /* #### Ben sez: this is way bogus if the glyph is a string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 You should not make the output routines have to cope with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 this. The string could contain Mule characters, or non-
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646 printable characters, or characters to be passed through
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647 the display table, or non-character objects (when this gets
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 implemented), etc. Instead, this routine here should parse
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 the string into a series of runes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 rb.object.dglyph.glyph = gb->glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1651 rb.object.dglyph.extent = gb->extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 rb.object.dglyph.xoffset = xoffset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 if (allow_cursor)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1655 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1656 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1657 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 rb.bufpos = bytind_to_bufpos (buf, data->bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 if (data->cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 if (data->bi_bufpos == data->bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671 else if (data->cursor_type == NEXT_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673 rb.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 data->cursor_x = Dynarr_length (data->db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 data->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 else if (data->cursor_type == IGNORE_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 rb.cursor_type = IGNORE_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 else if (data->cursor_type == NO_CURSOR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680 rb.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687 Dynarr_add (data->db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 data->pixpos += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 }
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 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 if (!NILP (glyph_face (gb->glyph, data->window)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695 gb->findex =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697 data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 gb->findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 if (pos_type == BEGIN_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 if (!data->dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704 data->dl->left_glyphs = Dynarr_new (struct glyph_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 Dynarr_add (data->dl->left_glyphs, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 else if (pos_type == END_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1709 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 if (!data->dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711 data->dl->right_glyphs = Dynarr_new (struct glyph_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712 Dynarr_add (data->dl->right_glyphs, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 abort (); /* there are no unknown types */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719 return NULL; /* shut up compiler */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 /* Add all glyphs at position POS_TYPE that are contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723 data. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 static prop_block_dynarr *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 add_glyph_runes (pos_data *data, int pos_type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729 why didn't you just modify add_glyph_rune in the first place? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732 ? data->ef->begin_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 : data->ef->end_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 /* #### Add some propagation information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744 return prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 Dynarr_reset (glyph_arr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 return NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 /* Given a position for a buffer in a window, ensure that the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 display line DL accurately represents the text on a line starting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 at the given position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 NOTE NOTE NOTE NOTE: This function works with and returns Bytinds.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758 You must do appropriate conversion. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 static Bytind
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 create_text_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 Bytind bi_start_pos, int start_col,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763 prop_block_dynarr **prop, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769 pos_data data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770 struct Lisp_Vector *dt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772 /* Don't display anything in the minibuffer if this window is not on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 a selected frame. We consider all other windows to be active
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 minibuffers as it simplifies the coding. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775 int active_minibuffer = (!MINI_WINDOW_P (w) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 (f == device_selected_frame (d)) ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777 is_surrogate_for_selected_frame (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 int truncate_win = window_truncation_on (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 int end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782 /* If the buffer's value of selective_display is an integer then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 only lines that start with less than selective_display columns of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784 space will be displayed. If selective_display is t then all text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 after a ^M is invisible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 int selective = (INTP (b->selective_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 ? XINT (b->selective_display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 : ((!NILP (b->selective_display) ? -1 : 0)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 /* The variable ctl-arrow allows the user to specify what characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 can actually be displayed and which octal should be used for.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 #### This variable should probably have some rethought done to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1794
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 #### It would also be really nice if you could specify that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 the characters come out in hex instead of in octal. Mule
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 does that by adding a ctl-hexa variable similar to ctl-arrow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 but that's bogus -- we need a more general solution. I
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 think you need to extend the concept of display tables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 into a more general conversion mechanism. Ideally you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 could specify a Lisp function that converts characters,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 but this violates the Second Golden Rule and besides would
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 make things way way way way slow. An idea I like is to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 be able to specify multiple display tables instead of just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 one. Each display table can specify conversions for some
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 characters and leave others unchanged. The way the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 character gets displayed is determined by the first display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 table with a binding for that character. This way, you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 could call a function `enable-hex-display' that adds a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 pre-defined hex display-table (or maybe computes one if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 you give weird parameters to the function) and adds it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812 to the list of display tables for the current buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 Unfortunately there are still problems dealing with Mule
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 characters. For example, maybe I want to specify that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 all extended characters (i.e. >= 256) are displayed in hex.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817 It's not reasonable to create a mapping for all possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 such characters, because there are about 2^19 of them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 One way of dealing with this is to extend the concept
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1820 of what a display table is. Currently it's only allowed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 to be a 256-entry vector. Instead, it should be something
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 like:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824 a) A 256-entry vector, for backward compatibility
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 b) Some sort of hashtable, mapping characters to values
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 c) A list that specifies a range of values and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 mapping to provide for those values.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829 Also, extend the concept of "mapping" to include a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 printf-like spec. Then, you could make all extended
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831 characters show up as hex with a display table like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833 ((256 . 524288) . "%x")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 Since more than one display table is possible, you have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836 great flexibility in mapping ranges of characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 Emchar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841 ? 255 : 160));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843 /* The text display block for this display line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 /* The first time through the main loop we need to force the glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 data to be updated. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 int initial = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 /* Apparently the new extent_fragment_update returns an end position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 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
1852 displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 int no_more_frags = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855 Lisp_Object synch_minibuffers_value =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 dl->used_prop_data = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 dl->num_chars = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 memset (&data, 0, sizeof (data));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 data.ef = extent_fragment_new (w->buffer, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 /* These values are used by all of the rune addition routines. We add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 them to this structure for ease of passing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 data.db = db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871 data.bi_bufpos = bi_start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872 data.pixpos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873 data.last_charset = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 data.result_str = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 /* Set the right boundary adjusting it to take into account any end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877 glyph. Save the width of the end glyph for later use. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878 data.max_pixpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 data.max_pixpos -= end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1885 if (cursor_in_echo_area)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1887 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1888 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889 data.bi_cursor_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1892 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 else if (MINI_WINDOW_P (w) && !active_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 data.bi_cursor_bufpos = BI_BUF_PT (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 data.bi_cursor_bufpos = bi_marker_position (w->pointm[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905 data.cursor_type = CURSOR_ON;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 data.cursor_x = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 data.start_col = w->hscroll;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 data.bi_start_col_enabled = (w->hscroll ? bi_start_pos : 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914 /* We regenerate the line from the very beginning. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917 /* 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
1918 starting position is already equal to the maximum we can't add
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919 anything else, right? Wrong. We might still have a newline to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 add. A newline can use the room allocated for an end glyph since
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1921 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
1922 glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924 /* #### Chuck -- I think this condition should be while (1).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926 and the begin-glyph ends exactly at the end of the window, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 end-glyph and text might not be displayed. while (1) ensures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 that the loop terminates only when either (a) there is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929 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
1930
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931 #### Also I think you need to ensure that the operation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 "add begin glyphs; add end glyphs; add text" is atomic and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933 can't get interrupted in the middle. If you run off the end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1934 of the line during that operation, then you keep accumulating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935 propagation data until you're done. Otherwise, if the (e.g.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 there's a begin glyph at a particular position and attempting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937 to display that glyph results in window-end being hit and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 propagation data being generated, then the character at that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939 position won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1940
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941 #### See also the comment after the end of this loop, below.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 while (data.pixpos <= data.max_pixpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944 && (active_minibuffer || !NILP (synch_minibuffers_value)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946 /* #### This check probably should not be necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 if (data.bi_bufpos > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 /* #### urk! More of this lossage! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1950 data.bi_bufpos--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 /* If selective display was an integer and we aren't working on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 a continuation line then find the next line we are actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 supposed to display. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 if (selective > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958 && (data.bi_bufpos == BI_BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959 || BUF_FETCH_CHAR (b, prev_bytind (b, data.bi_bufpos)) == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 data.bi_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 if (data.bi_bufpos >= BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 data.bi_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973 /* Check for face changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 if (initial || (!no_more_frags && data.bi_bufpos == data.ef->end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 /* Now compute the face and begin/end-glyph information. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 data.findex =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 /* Remember that the extent-fragment routines deal in Bytind's. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 extent_fragment_update (w, data.ef, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981 if (data.bi_bufpos == data.ef->end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982 no_more_frags = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984 dt = get_display_table (w, data.findex);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 initial = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 /* Determine what is next to be displayed. We first handle any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989 glyphs returned by glyphs_at_bufpos. If there are no glyphs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 display then we determine what to do based on the character at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991 current buffer position. */
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 the current position is covered by an invisible extent, do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994 nothing (except maybe add some ellipses).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 #### The behavior of begin and end-glyphs at the edge of an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 invisible extent should be investigated further. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 fairly low priority though. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999 if (data.ef->invisible)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001 /* #### Chuck, perhaps you could look at this code? I don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 really know what I'm doing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 *prop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009 /* The extent fragment code only sets this when we should
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010 really display the ellipses. It makes sure the ellipses
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011 don't get displayed more than once in a row. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 if (data.ef->invisible_ellipses)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2013 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2014 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2015
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016 data.ef->invisible_ellipses_already_displayed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 data.ef->invisible_ellipses = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2021 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2022 /* Perhaps they shouldn't propagate if the very next thing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023 is to display a newline (for compatibility with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 selective-display-ellipses)? Maybe that's too
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025 abstruse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 /* If point is in an invisible region we place it on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 next visible character. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 && data.bi_bufpos == data.bi_cursor_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 data.cursor_type = NEXT_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038 /* #### What if we we're dealing with a display table? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 if (data.start_col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 data.start_col--;
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 (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 INC_BYTIND (b, data.bi_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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 /* If there is propagation data, then it represents the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 buffer position being displayed. Add them and advance the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 position counter. This might also add the minibuffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 prompt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 else if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 dl->used_prop_data = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055 *prop = add_propagation_runes (prop, &data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 goto done; /* gee, a really narrow window */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 else if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061 else if (data.bi_bufpos < BI_BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2063 data.bi_bufpos = BI_BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068 /* If there are end glyphs, add them to the line. These are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 the end glyphs for the previous run of text. We add them
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070 here rather than doing them at the end of handling the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071 previous run so that glyphs at the beginning and end of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 a line are handled correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 else if (Dynarr_length (data.ef->end_glyphs) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 *prop = add_glyph_runes (&data, END_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 goto done;
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 begin glyphs, add them to the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088 /* If at end-of-buffer, we've already processed begin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089 end-glyphs at this point and there's no text to process,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 so we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091 else if (data.bi_bufpos == BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2092 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 /* Get the character at the current buffer position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099 /* If there is a display table entry for it, hand it off to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100 add_disp_table_entry_runes and let it worry about it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101 if (dt && !NILP (DISP_CHAR_ENTRY (dt, data.ch)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 *prop =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104 add_disp_table_entry_runes (&data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2105 DISP_CHAR_ENTRY (dt, data.ch));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2107 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 /* Check if we have hit a newline character. If so, add a marker
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112 to the line and end this loop. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 else if (data.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 /* We aren't going to be adding an end glyph so give its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 space back in order to make sure that the cursor can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 fit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120 if (selective > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121 && (bi_spaces_at_point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 (b, next_bytind (b, data.bi_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123 >= selective))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125 if (!NILP (b->selective_display_ellipses))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 /* Cheesy, cheesy, cheesy. We mark the end of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 line with a special "character rune" whose width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138 is the EOL cursor width and whose character is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139 the non-printing character '\n'. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2140 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 /* We need to set data.bi_bufpos to the start of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145 next visible region in order to make this line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146 appear to contain all of the invisible area.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147 Otherwise, the line cache won't work
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150 while (bi_spaces_at_point (b, data.bi_bufpos) >= selective)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2151 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2152 data.bi_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 if (data.bi_bufpos >= BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156 data.bi_bufpos = BI_BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 if (BI_BUF_FETCH_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161 (b, prev_bytind (b, data.bi_bufpos)) == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162 DEC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2163 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2169
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2170 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2171 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 /* If the current character is ^M, and selective display is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174 enabled, then add the invisible-text-glyph if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175 selective-display-ellipses is set. In any case, this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176 line is done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 else if (data.ch == (('M' & 037)) && selective == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 Bytind bi_next_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181 /* Find the buffer position at the end of the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182 bi_next_bufpos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184 if (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_next_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185 == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186 DEC_BYTIND (b, bi_next_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2187
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2188 /* If the cursor is somewhere in the elided text make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189 sure that the cursor gets drawn appropriately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191 && (data.bi_cursor_bufpos >= data.bi_bufpos &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2192 data.bi_cursor_bufpos < bi_next_bufpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2193 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2194 data.cursor_type = NEXT_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2195 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2196
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2197 /* We won't be adding a truncation or continuation glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2198 so give up the room allocated for them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2199 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2201 if (!NILP (b->selective_display_ellipses))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2202 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2203 /* We don't propagate anything from the invisible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2204 text glyph if it fails to fit. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2205 intentional. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2206 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2208 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2209 gb.glyph = Vinvisible_text_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2210 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2211 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2212 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2213
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2214 /* Set the buffer position to the end of the line. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2215 need to do this before potentially adding a newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2216 so that the cursor flag will get set correctly (if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2217 needed). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2218 data.bi_bufpos = bi_next_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2220 if (NILP (b->selective_display_ellipses)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2221 || data.bi_cursor_bufpos == bi_next_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2222 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2223 /* We have to at least add a newline character so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2224 that the cursor shows up properly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2225 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2226 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2227 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2228 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2229 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2230
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2231 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2232 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2234 /* This had better be a newline but doing it this way
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2235 we'll see obvious incorrect results if it isn't. No
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2236 need to abort here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2237 data.ch = BI_BUF_FETCH_CHAR (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2238
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2239 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2240 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2242 /* If the current character is considered to be printable, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2243 just add it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2244 else if (data.ch >= printable_min)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2245 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2246 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2247 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2248 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2249 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2251 /* If the current character is a tab, determine the next tab
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2252 starting position and add a blank rune which extends from the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2253 current pixel position to that starting position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2254 else if (data.ch == '\t')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2255 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2256 int tab_start_pixpos = data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2257 int next_tab_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2258 int char_tab_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2259 int prop_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2260
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2261 if (data.start_col > 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2262 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2263
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2264 next_tab_start = next_tab_position (w, tab_start_pixpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2265 dl->bounds.left_in);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2266 if (next_tab_start > data.max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2267 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2268 prop_width = next_tab_start - data.max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2269 next_tab_start = data.max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2270 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2271 data.blank_width = next_tab_start - data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2272 char_tab_width =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2273 (next_tab_start - tab_start_pixpos) / space_width (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2274
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2275 *prop = add_blank_rune (&data, w, char_tab_width);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2276
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2277 /* add_blank_rune is only supposed to be called with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2278 sizes guaranteed to fit in the available space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2279 assert (!(*prop));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2280
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2281 if (prop_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2282 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2283 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2284 *prop = Dynarr_new (struct prop_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2286 pb.type = PROP_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2287 pb.data.p_blank.width = prop_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2288 pb.data.p_blank.findex = data.findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2289 Dynarr_add (*prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2291 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2292 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2293 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2295 /* If character is a control character, pass it off to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2296 add_control_char_runes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2297
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2298 The is_*() routines have undefined results on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2299 arguments outside of the range [-1, 255]. (This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2300 often bites people who carelessly use `char' instead
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2301 of `unsigned char'.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2302 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2303 else if (data.ch < 0x100 && iscntrl ((Bufbyte) data.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2304 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2305 *prop = add_control_char_runes (&data, b);
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 (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2308 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2309 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2310
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2311 /* If the character is above the ASCII range and we have not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2312 already handled it, then print it as an octal number. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2313 else if (data.ch >= 0200)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2314 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2315 *prop = add_octal_runes (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2316
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2317 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2318 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2319 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2321 /* Assume the current character is considered to be printable,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2322 then just add it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2323 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2324 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2325 *prop = add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2326 if (*prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2327 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2328 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2330 INC_BYTIND (b, data.bi_bufpos);
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2334 done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2336 /* 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
2337 end of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2338 if (data.bi_bufpos < BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2339 && (active_minibuffer || !NILP (synch_minibuffers_value)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2340 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2341 /* #### This check is not correct. If the line terminated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2342 due to a begin-glyph or end-glyph hitting window-end, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2343 data.ch will not point to the character at data.bi_bufpos. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2344 you make the two changes mentioned at the top of this loop,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2345 you should be able to say '(if (*prop))'. That should also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2346 make it possible to eliminate the data.bi_bufpos < BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2347 check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2349 /* The common case is that the line ended because we hit a newline.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2350 In that case, the next character is just the next buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2351 position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2352 if (data.ch == '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2353 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2354 /* If data.start_col_enabled is still true, then the window is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2355 scrolled far enough so that nothing on this line is visible.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2356 We need to stick a trunctation glyph at the beginning of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2357 line in that case unless the line is completely blank. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2358 if (data.bi_start_col_enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2359 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2360 if (data.cursor_type == CURSOR_ON)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2361 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2362 if (data.bi_cursor_bufpos >= bi_start_pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2363 && data.bi_cursor_bufpos <= data.bi_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2364 data.bi_cursor_bufpos = data.bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2365 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2366 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2367 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2368 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2370 if (data.bi_bufpos != bi_start_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2371 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2372 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2373
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2374 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2375 gb.glyph = Vhscroll_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2376 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2377 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2378 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2379 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2380 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2381 /* This duplicates code down below to add a newline to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2382 the end of an otherwise empty line.*/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2383 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2384 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2385
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2386 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2387 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2388 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2390 INC_BYTIND (b, data.bi_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2391 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2392
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2393 /* Otherwise we have a buffer line which cannot fit on one display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2394 line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2395 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2396 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2397 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2398 struct glyph_cachel *cachel;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2399
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2400 /* If the line is to be truncated then we actually have to look
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2401 for the next newline. We also add the end-of-line glyph which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2402 we know will fit because we adjusted the right border before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2403 we starting laying out the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2404 data.max_pixpos += end_glyph_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2405 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2406 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2407
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2408 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2409 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2410 Bytind bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2412 /* Now find the start of the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2413 bi_pos = bi_find_next_newline_no_quit (b, data.bi_bufpos, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2414
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2415 /* If the cursor is past the truncation line then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2416 make it appear on the truncation glyph. If we've hit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2417 the end of the buffer then we also make the cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2418 appear unless eob is immediately preceeded by a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2419 newline. In that case the cursor should actually
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2420 appear on the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2421 if (data.cursor_type == CURSOR_ON
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2422 && data.bi_cursor_bufpos >= data.bi_bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2423 && (data.bi_cursor_bufpos < bi_pos ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2424 (bi_pos == BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2425 && (bi_pos == BI_BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2426 || (BI_BUF_FETCH_CHAR (b, prev_bytind (b, bi_pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2427 != '\n')))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2428 data.bi_cursor_bufpos = bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2429 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2430 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2431
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2432 data.bi_bufpos = bi_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2433 gb.glyph = Vtruncation_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2434 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2435 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2436 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2437 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2438 /* The cursor can never be on the continuation glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2439 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2441 /* data.bi_bufpos is already at the start of the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2442
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2443 gb.glyph = Vcontinuation_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2444 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2445 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2446
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2447 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1, cachel);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2449 if (truncate_win && data.bi_bufpos == BI_BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2450 && BI_BUF_FETCH_CHAR (b, prev_bytind (b, BI_BUF_ZV (b))) != '\n')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2451 /* #### Damn this losing shit. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2452 data.bi_bufpos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2453 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2454 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2455 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2456 && (!echo_area_active (f) || data.bi_bufpos == BI_BUF_ZV (b)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2457 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2458 /* 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
2459 newline character in order for the cursor to get drawn. We label
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2460 it as a newline so that it gets handled correctly by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2461 whitespace routines below. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2463 data.ch = '\n';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2464 data.blank_width = DEVMETH (d, eol_cursor_width, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2465 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2466 data.start_col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2467 data.bi_start_col_enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2468
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2469 data.max_pixpos += data.blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2470 add_emchar_rune (&data);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2471 data.max_pixpos -= data.blank_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2472
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2473 /* #### urk! Chuck, this shit is bad news. Going around
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2474 manipulating invalid positions is guaranteed to result in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2475 trouble sooner or later. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2476 data.bi_bufpos = BI_BUF_ZV (b) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2477 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2479 /* Calculate left whitespace boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2480 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2481 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2482
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2483 /* Whitespace past a newline is considered right whitespace. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2484 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2485 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2486 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2488 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2489 || rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2490 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2491 dl->bounds.left_white += rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2492 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2493 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2494 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2495 elt = Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2496 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2497 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2498
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2499 /* Calculate right whitespace boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2500 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2501 int elt = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2502 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2504 while (!done && elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2505 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2506 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2507
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2508 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2509 && isspace (rb->object.chr.ch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2510 && !rb->type == RUNE_BLANK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2511 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2512 dl->bounds.right_white = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2513 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2514 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2516 elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2517
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2518 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2519
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2520 /* The line is blank so everything is considered to be right
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2521 whitespace. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2522 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2523 dl->bounds.right_white = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2524 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2525
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2526 /* Set the display blocks bounds. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2527 db->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2528 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2529 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2530 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2532 db->end_pos = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2533 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2534 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2535 db->end_pos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2536
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2537 /* update line height parameters */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2538 if (!data.new_ascent && !data.new_descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2539 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2540 /* We've got a blank line so initialize these values from the default
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2541 face. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2542 default_face_font_info (data.window, &data.new_ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2543 &data.new_descent, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2544 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2546 if (data.max_pixmap_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2547 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2548 int height = data.new_ascent + data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2549 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2550
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2551 pix_descent = data.max_pixmap_height * data.new_descent / height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2552 pix_ascent = data.max_pixmap_height - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2554 data.new_ascent = max (data.new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2555 data.new_descent = max (data.new_descent, pix_descent);
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 dl->ascent = data.new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2559 dl->descent = data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2560
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2561 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2562 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2564 if (dl->ascent < ascent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2565 dl->ascent = ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2566 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2567 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2568 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2569
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2570 if (dl->descent < descent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2571 dl->descent = 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 dl->cursor_elt = data.cursor_x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2575 /* #### lossage lossage lossage! Fix this shit! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2576 if (data.bi_bufpos > BI_BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2577 dl->end_bufpos = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2578 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2579 dl->end_bufpos = bytind_to_bufpos (b, data.bi_bufpos) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2580 if (truncate_win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2581 data.dl->num_chars = column_at_point (b, dl->end_bufpos, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2582 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2583 /* This doesn't correctly take into account tabs and control
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2584 characters but if the window isn't being truncated then this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2585 value isn't going to end up being used anyhow. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2586 data.dl->num_chars = dl->end_bufpos - dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2587
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2588 /* #### handle horizontally scrolled line with text none of which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2589 was actually laid out. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2590
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2591 /* #### handle any remainder of overlay arrow */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2592
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2593 if (*prop == ADD_FAILED)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2594 *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2595
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2596 if (truncate_win && *prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2597 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2598 Dynarr_free (*prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2599 *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2600 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2601
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2602 extent_fragment_delete (data.ef);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2603
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2604 /* #### If we started at EOB, then make sure we return a value past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2605 it so that regenerate_window will exit properly. This is bogus.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2606 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
2607 this function if we are already at EOB. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2609 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
2610 return (data.bi_bufpos + 1); /* Yuck! */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2611 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2612 return data.bi_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2613 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2614
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2615 /* Display the overlay arrow at the beginning of the given line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2617 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2618 create_overlay_glyph_block (struct window *w, struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2619 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2620 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2621 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2622 pos_data data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2623
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2624 /* If Voverlay_arrow_string isn't valid then just fail silently. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2625 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2626 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2628 memset (&data, 0, sizeof (data));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2629 data.ef = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2630 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2631 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2632 data.db = get_display_block_from_line (dl, OVERWRITE);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2633 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2634 data.pixpos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2635 data.max_pixpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2636 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2637 data.cursor_x = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2638 data.findex = DEFAULT_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2639 data.last_charset = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2640 data.result_str = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2641
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2642 Dynarr_reset (data.db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2643
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2644 if (STRINGP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2645 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2646 add_bufbyte_string_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2647 (&data,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2648 string_data (XSTRING (Voverlay_arrow_string)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2649 string_length (XSTRING (Voverlay_arrow_string)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2650 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2651 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2652 else if (GLYPHP (Voverlay_arrow_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2653 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2654 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2655
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2656 gb.glyph = Voverlay_arrow_string;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2657 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2658 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2659 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2661 if (data.max_pixmap_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2662 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2663 int height = data.new_ascent + data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2664 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2665
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2666 pix_descent = data.max_pixmap_height * data.new_descent / height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2667 pix_ascent = data.max_pixmap_height - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2668
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2669 data.new_ascent = max (data.new_ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2670 data.new_descent = max (data.new_descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2671 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2672
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2673 dl->ascent = data.new_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2674 dl->descent = data.new_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2675
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2676 data.db->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2677 data.db->end_pos = data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2678
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2679 return (data.pixpos - dl->bounds.left_in);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2680 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2681
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2682 /* Add a type of glyph to a margin display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2683
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2684 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2685 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2686 int count, int glyph_type, int side, Lisp_Object window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2687 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2688 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2689 ? dl->left_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2690 : dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2691 int elt, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2692 int xpos = start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2693 int reverse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2694
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2695 if ((glyph_type == GL_WHITESPACE && side == LEFT_GLYPHS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2696 || (glyph_type == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2697 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2698 reverse = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2699 elt = Dynarr_length (gbd) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2700 end = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2701 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2702 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2703 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2704 reverse = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2705 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2706 end = Dynarr_length (gbd);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2707 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2708
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2709 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2710 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2711 struct glyph_block *gb = Dynarr_atp (gbd, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2712
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2713 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2714 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2715
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2716 if (gb->active &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2717 ((side == LEFT_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2718 extent_begin_glyph_layout (XEXTENT (gb->extent)) == glyph_type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2719 || (side == RIGHT_GLYPHS &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2720 extent_end_glyph_layout (XEXTENT (gb->extent)) == glyph_type)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2721 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2722 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2723
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2724 rb.width = gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2725 rb.findex = gb->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2726 rb.xpos = xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2727 rb.bufpos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2728 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2729 rb.type = RUNE_DGLYPH;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2730 rb.object.dglyph.glyph = gb->glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2731 rb.object.dglyph.extent = gb->extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2732 rb.object.dglyph.xoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2733 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2734
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2735 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2736 xpos += rb.width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2737 count--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2738 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2739
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2740 if (glyph_contrib_p (gb->glyph, window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2741 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2742 unsigned short ascent, descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2743 Lisp_Object baseline = glyph_baseline (gb->glyph, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2745 ascent = glyph_ascent (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2746 descent = glyph_descent (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2748 /* A pixmap that has not had a baseline explicitly set.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2749 We use the existing ascent / descent ratio of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2750 line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2751 if (NILP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2752 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2753 int gheight = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2754 int line_height = dl->ascent + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2755 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2757 pix_descent = (int) (gheight * dl->descent) / line_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2758 pix_ascent = gheight - pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2759
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2760 dl->ascent = max ((int) dl->ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2761 dl->descent = max ((int) dl->descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2762 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2764 /* A string so determine contribution normally. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2765 else if (EQ (baseline, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2766 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2767 dl->ascent = max (dl->ascent, ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2768 dl->descent = max (dl->descent, 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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2771 /* A pixmap with an explicitly set baseline. We determine the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2772 contribution here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2773 else if (INTP (baseline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2774 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2775 int height = ascent + descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2776 int pix_ascent, pix_descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2777
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2778 pix_ascent = height * XINT (baseline) / 100;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2779 pix_descent = height - pix_ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2780
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2781 dl->ascent = max ((int) dl->ascent, pix_ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2782 dl->descent = max ((int) dl->descent, pix_descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2783 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2784
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2785 /* Otherwise something is screwed up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2786 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2787 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2788 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2789 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2791 (reverse ? elt-- : elt++);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2792 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2794 return xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2795 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2797 /* Add a blank to a margin display block. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2798
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2799 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2800 add_margin_blank (struct display_line *dl, struct display_block *db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2801 struct window *w, int xpos, int width, int side)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2802 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2803 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2804
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2805 rb.findex = (side == LEFT_GLYPHS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2806 ? get_builtin_face_cache_index (w, Vleft_margin_face)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2807 : get_builtin_face_cache_index (w, Vright_margin_face));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2808 rb.xpos = xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2809 rb.width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2810 rb.bufpos = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2811 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2812 rb.type = RUNE_BLANK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2813 rb.cursor_type = CURSOR_OFF;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2814
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2815 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2816 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2817
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2818 /* Display glyphs in the left outside margin, left inside margin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2819 left whitespace area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2820
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2821 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2822 create_left_glyph_block (struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2823 int overlay_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2824 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2825 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2826
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2827 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2828 int elt, end_xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2829 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
2830 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
2831 int left_in_start = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2832 int left_in_end = dl->bounds.left_in + overlay_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2834 struct display_block *odb, *idb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2835
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2836 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2837
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2838 /* We have to add the glyphs to the line in the order outside,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2839 inside, whitespace. However the precedence dictates that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2840 determine how many will fit in the reverse order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2841
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2842 /* Determine how many whitespace glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2843 they should start. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2844 white_in_start = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2845 white_out_start = left_in_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2846 white_out_cnt = white_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2847 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2849 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2850 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2851 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2852
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2853 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2854 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2856 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2857 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2858 int width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2859
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2860 width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2862 if (white_in_start - width >= left_in_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2863 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2864 white_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2865 white_in_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2866 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2867 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2868 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2869 else if (use_overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2870 && (white_out_start - width > dl->bounds.left_out))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2871 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2872 white_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2873 white_out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2874 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2875 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2876 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2877 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2878 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2879 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2880
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2881 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2882 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2883
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2884 /* Determine how many inside margin glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2885 they should start. The inside margin glyphs get whatever space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2886 is left after the whitespace glyphs have been displayed. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2887 are tricky to calculate since if we decide to use the overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2888 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
2889 list of just the inside margin glyphs and manipulate it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2890 determine the needed info. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2891 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2892 glyph_block_dynarr *ib;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2893 int avail_in, avail_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2894 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2895 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2896 int used_in, used_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2898 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2899 used_in = used_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2900 ib = Dynarr_new (struct glyph_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2901 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2902 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2903 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2904
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2905 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2906 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2907
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2908 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2909 GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2910 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2911 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2912 used_in += gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2913 Dynarr_add (ib, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2914 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2915
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2916 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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2919 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2920 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2921 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2922 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2923 avail_in = white_in_start - left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2924 if (avail_in < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2925 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2926 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2927
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2928 if (!use_overflow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2929 avail_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2930 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2931 avail_out = white_out_start - dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2932
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2933 marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2934 while (!done && marker < Dynarr_length (ib))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2935 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2936 int width = Dynarr_atp (ib, marker)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2937
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2938 /* If everything now fits in the available inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2939 space, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2940 if (used_in <= avail_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2941 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2942 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2943 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2944 /* Otherwise see if we have room to move a glyph to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2945 outside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2946 if (used_out + width <= avail_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2947 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2948 used_out += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2949 used_in -= 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 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2952 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2953 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2954
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2955 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2956 marker++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2957 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2958
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2959 /* At this point we now know that everything from marker on goes in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2960 the inside margin and everything before it goes in the outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2961 margin. The stuff going into the outside margin is guaranteed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2962 to fit, but we may have to trim some stuff from the inside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2964 in_in_end = left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2965 in_out_start = white_out_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2966 in_out_cnt = in_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2967
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2968 Dynarr_free (ib);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2969 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2970 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2971 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2972 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2973
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2974 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2975 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2977 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2978 GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2979 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2980 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2982 if (used_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2983 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2984 in_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2985 in_out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2986 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2987 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2988 used_out -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2989 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2990 else if (in_in_end + width < white_in_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2991 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2992 in_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2993 in_in_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2994 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2995 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2996 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2997 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2998 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2999 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3001 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3002 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3003 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3005 /* Determine how many outside margin glyphs we can display. They
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3006 always start at the left outside margin and can only use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3007 outside margin space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3008 out_end = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3009 out_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3010 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3012 while (elt < Dynarr_length (dl->left_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3013 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3014 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, 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 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3017 abort (); /* these should have beeb handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3019 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3020 GL_OUTSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3021 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3022 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3023
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3024 if (out_end + width <= in_out_start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3025 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3026 out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3027 out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3028 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3029 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3030 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3031 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3032 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3033 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3034
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3035 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3036 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3038 /* Now that we now where everything goes, we add the glyphs as runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3039 to the appropriate display blocks. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3040 if (out_cnt || in_out_cnt || white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3041 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3042 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3043 odb->start_pos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3044 /* #### We should stop adding a blank to account for the space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3045 between the end of the glyphs and the margin and instead set
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3046 this accordingly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3047 odb->end_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3048 Dynarr_reset (odb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3049 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3050 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3051 odb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3052
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3053 if (in_in_cnt || white_in_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 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3056 idb->start_pos = dl->bounds.left_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3057 /* #### See above comment for odb->end_pos */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3058 idb->end_pos = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3059 Dynarr_reset (idb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3060 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3061 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3062 idb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3063
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3064 /* First add the outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3065 if (out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3066 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3067 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3068 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3069 end_xpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3070
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3071 /* There may be blank space between the outside margin glyphs and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3072 the inside margin glyphs. If so, add a blank. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3073 if (in_out_cnt && (in_out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3074 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3075 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3076 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3077 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3078
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3079 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3080 outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3081 if (in_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3082 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3083 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3084 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3085 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3086
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3087 /* If we didn't add any inside margin glyphs to the outside margin,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3088 but are adding whitespace glyphs, then we need to add a blank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3089 here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3090 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3091 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3092 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3093 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3094 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3095
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3096 /* Next add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3097 outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3098 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3099 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3100 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3101 GL_WHITESPACE, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3102 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3103
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3104 /* We take care of clearing between the end of the glyphs and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3105 start of the inside margin for lines which have glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3106 if (odb && (left_in_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3107 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3108 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3109 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3110 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3112 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3113 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3114 if (in_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3115 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3116 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3117 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3118 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3119 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3120 end_xpos = left_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3121
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3122 /* Make sure that the area between the end of the inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3123 glyphs and the whitespace glyphs is cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3124 if (idb && (white_in_start - end_xpos > 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3125 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3126 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3127 LEFT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3128 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3130 /* Next add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3131 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3132 if (white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3133 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3134 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3135 LEFT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3136 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3137
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3138 /* Whitespace glyphs always end right next to the text block so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3139 there is nothing we have to make sure is cleared after them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3140 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3141
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3142 /* Display glyphs in the right outside margin, right inside margin and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3143 right whitespace area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3145 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3146 create_right_glyph_block (struct window *w, struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3147 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3148 Lisp_Object 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 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3151 int elt, end_xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3152 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
3153 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
3154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3155 struct display_block *odb, *idb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3156
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3157 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3159 /* We have to add the glyphs to the line in the order outside,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3160 inside, whitespace. However the precedence dictates that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3161 determine how many will fit in the reverse order. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3163 /* Determine how many whitespace glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3164 they should start. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3165 white_in_end = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3166 white_out_end = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3167 white_out_cnt = white_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3168 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3169
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3170 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3171 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3172 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3174 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3175 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3177 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3178 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3179 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3180
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3181 if (white_in_end + width <= dl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3182 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3183 white_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3184 white_in_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3185 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3186 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3187 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3188 else if (use_overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3189 && (white_out_end + width <= dl->bounds.right_out))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3190 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3191 white_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3192 white_out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3193 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3194 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3195 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3196 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3197 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3198 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3200 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3201 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3202
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3203 /* Determine how many inside margin glyphs we can display and where
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3204 they should start. The inside margin glyphs get whatever space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3205 is left after the whitespace glyphs have been displayed. These
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3206 are tricky to calculate since if we decide to use the overflow
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3207 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
3208 list of just the inside margin glyphs and manipulate it to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3209 determine the needed info. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3210 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3211 glyph_block_dynarr *ib;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3212 int avail_in, avail_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3213 int done = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3214 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3215 int used_in, used_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3216
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3217 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3218 used_in = used_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3219 ib = Dynarr_new (struct glyph_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3220 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3221 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3222 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3223
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3224 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3225 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3226
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3227 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3228 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3229 gb->width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3230 used_in += gb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3231 Dynarr_add (ib, *gb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3232 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3234 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3235 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3237 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3238 avail_in = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3239 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3240 avail_in = dl->bounds.right_in - white_in_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3242 if (!use_overflow)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3243 avail_out = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3244 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3245 avail_out = dl->bounds.right_out - white_out_end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3246
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3247 marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3248 while (!done && marker < Dynarr_length (ib))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3249 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3250 int width = Dynarr_atp (ib, marker)->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3251
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3252 /* If everything now fits in the available inside margin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3253 space, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3254 if (used_in <= avail_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3255 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3256 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3257 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3258 /* Otherwise see if we have room to move a glyph to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3259 outside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3260 if (used_out + width <= avail_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3261 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3262 used_out += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3263 used_in -= 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 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3266 done = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3267 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3268
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3269 if (!done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3270 marker++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3271 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3272
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3273 /* At this point we now know that everything from marker on goes in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3274 the inside margin and everything before it goes in the outside
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3275 margin. The stuff going into the outside margin is guaranteed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3276 to fit, but we may have to trim some stuff from the inside. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3277
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3278 in_in_start = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3279 in_out_end = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3280 in_out_cnt = in_in_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3281
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3282 Dynarr_free (ib);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3283 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3284 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3285 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3286 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3287
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3288 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3289 abort (); /* these should have been handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3291 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3292 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3293 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3295 if (used_out)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3296 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3297 in_out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3298 in_out_end += width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3299 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3300 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3301 used_out -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3302 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3303 else if (in_in_start - width >= white_in_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3304 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3305 in_in_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3306 in_in_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3307 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3308 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3309 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3310 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3311 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3312 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3314 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3315 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3316 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3317
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3318 /* Determine how many outside margin glyphs we can display. They
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3319 always start at the right outside margin and can only use the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3320 outside margin space. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3321 out_start = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3322 out_cnt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3323 elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3324
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3325 while (elt < Dynarr_length (dl->right_glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3326 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3327 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, 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 if (NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3330 abort (); /* these should have beeb handled in add_glyph_rune */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3331
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3332 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3333 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3334 int width = glyph_width (gb->glyph, Qnil, gb->findex, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3336 if (out_start - width >= in_out_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3337 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3338 out_cnt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3339 out_start -= width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3340 gb->width = width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3341 gb->active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3342 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3343 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3344 gb->active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3345 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3346
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3347 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3348 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3350 /* Now that we now where everything goes, we add the glyphs as runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3351 to the appropriate display blocks. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3352 if (out_cnt || in_out_cnt || white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3353 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3354 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3355 /* #### See comments before odb->start_pos init in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3356 create_left_glyph_block */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3357 odb->start_pos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3358 odb->end_pos = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3359 Dynarr_reset (odb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3360 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3361 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3362 odb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3363
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3364 if (in_in_cnt || white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3365 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3366 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3367 idb->start_pos = dl->bounds.right_white;
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 idb->end_pos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3371 Dynarr_reset (idb->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3372 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3373 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3374 idb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3376 /* First add the whitespace margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3377 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3378 if (white_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3379 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3380 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3381 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3382 window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3383 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3384 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3385 end_xpos = dl->bounds.right_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3386
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3387 /* Make sure that the area between the end of the whitespace glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3388 and the inside margin glyphs is cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3389 if (in_in_cnt && (in_in_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3390 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3391 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3392 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3393 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3394
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3395 /* Next add the inside margin glyphs which are actually in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3396 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3397 if (in_in_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3398 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3399 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3400 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3401 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3402
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3403 /* 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
3404 of the inside margin area gets cleared. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3405 if (idb && (dl->bounds.right_in - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3406 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3407 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
3408 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3409 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3410
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3411 /* Next add any whitespace glyphs in the outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3412 if (white_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3413 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3414 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
3415 GL_WHITESPACE, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3416 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3417 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3418 end_xpos = dl->bounds.right_in;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3419
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3420 /* Next add any inside margin glyphs in the outside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3421 if (in_out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3422 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3423 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3424 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3425 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3427 /* There may be space between any whitespace or inside margin glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3428 in the outside margin and the actual outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3429 if (odb && (out_start - end_xpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3430 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3431 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3432 RIGHT_GLYPHS);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3433 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3434
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3435 /* Finally, add the outside margin glyphs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3436 if (out_cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3437 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3438 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3439 RIGHT_GLYPHS, window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3440 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3441 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3442
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3443
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3444 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3445 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3446 /* modeline routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3447 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3448 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3450 /* Ensure that the given display line DL accurately represents the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3451 modeline for the given window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3453 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3454 generate_modeline (struct window *w, struct display_line *dl, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3455 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3456 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3457 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3458 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3460 /* Unlike display line and rune pointers, this one can't change underneath
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3461 our feet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3462 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3463 int max_pixpos, min_pixpos, ypos_adj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3464 Lisp_Object font_inst;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3466 /* This will actually determine incorrect inside boundaries for the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3467 modeline since it ignores the margins. However being aware of this fact
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3468 we never use those values anywhere so it doesn't matter. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3469 dl->bounds = calculate_display_line_boundaries (w, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3471 /* We are generating a modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3472 dl->modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3473 dl->cursor_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3475 /* Reset the runes on the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3476 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3477
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3478 if (!WINDOW_HAS_MODELINE_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3479 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3480 struct rune rb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3481
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3482 /* If there is a horizontal scrollbar, don't add anything. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3483 if (window_scrollbar_height (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3484 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3485
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3486 dl->ascent = DEVMETH (d, divider_height, ());
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3487 dl->descent = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3488 /* The modeline is at the bottom of the gutters. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3489 dl->ypos = WINDOW_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3491 rb.findex = MODELINE_INDEX;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3492 rb.xpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3493 rb.width = dl->bounds.right_out - dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3494 rb.bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3495 rb.endpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3496 rb.type = RUNE_HLINE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3497 rb.object.hline.thickness = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3498 rb.object.hline.yoffset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3499 rb.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3500
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3501 if (!EQ (Qzero, w->modeline_shadow_thickness)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3502 && FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3503 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3504 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3505
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3506 dl->ypos -= shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3507 rb.xpos += shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3508 rb.width -= 2 * shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3509 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3510
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3511 Dynarr_add (db->runes, rb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3512 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3513 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3514
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3515 /* !!#### not right; needs to compute the max height of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3516 all the charsets */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3517 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
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->ascent = XFONT_INSTANCE (font_inst)->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3520 dl->descent = XFONT_INSTANCE (font_inst)->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3521
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3522 min_pixpos = dl->bounds.left_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3523 max_pixpos = dl->bounds.right_out;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3524
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3525 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3526 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3527 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3529 ypos_adj = shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3530 min_pixpos += shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3531 max_pixpos -= shadow_thickness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3532 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3533 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3534 ypos_adj = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3535
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3536 generate_formatted_string_db (b->modeline_format,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3537 b->generated_modeline_string, w, dl, db,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3538 MODELINE_INDEX, min_pixpos, max_pixpos, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3539
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3540 /* 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
3541 set this until we've generated teh modeline in order to account
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3542 for any embedded faces. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3543 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3544 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3546 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3547 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3548 struct window *w, struct display_line *dl,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3549 struct display_block *db, face_index findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3550 int min_pixpos, int max_pixpos, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3551 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3552 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3553 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3554
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3555 pos_data data;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3556 int c_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3557
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3558 memset (&data, 0, sizeof (data));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3559 data.d = d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3560 data.db = db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3561 data.dl = dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3562 data.findex = findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3563 data.pixpos = min_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3564 data.max_pixpos = max_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3565 data.cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3566 data.last_charset = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3567 data.result_str = result_str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3568 data.is_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3569 XSETWINDOW (data.window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3570
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3571 Dynarr_reset (formatted_string_extent_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3572 Dynarr_reset (formatted_string_extent_start_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3573 Dynarr_reset (formatted_string_extent_end_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3574
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3575 /* This recursively builds up the modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3576 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3577 max_pixpos - min_pixpos, findex, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3578
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3579 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3580 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3581 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3582 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3583 c_pixpos = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3584 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3585 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3586 c_pixpos = min_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3587
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3588 /* 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
3589 to make up the difference. This usually only occurs if the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3590 modeline face is using a proportional width font or a fixed width
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3591 font of a different size from the default face font. */
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 (c_pixpos < max_pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3594 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3595 data.pixpos = c_pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3596 data.blank_width = max_pixpos - data.pixpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3597
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3598 add_blank_rune (&data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3599 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3601 /* Now create the result string and frob the extents into it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3602 if (!NILP (result_str))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3603 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3604 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3605 Bytecount len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3606 Bufbyte *strdata;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3607 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3609 detach_all_extents (result_str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3610 resize_string (XSTRING (result_str), -1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3611 data.bytepos - string_length (XSTRING (result_str)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3612
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3613 strdata = string_data (XSTRING (result_str));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3614
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3615 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3616 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3617 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3618 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3619 len += (set_charptr_emchar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3620 (strdata + len, Dynarr_atp (db->runes,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3621 elt)->object.chr.ch));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3622 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3623 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3624
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3625 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3626 elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3627 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3628 Lisp_Object extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3629 Lisp_Object child;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3630
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3631 XSETEXTENT (extent, Dynarr_at (formatted_string_extent_dynarr, elt));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3632 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3633 if (NILP (child))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3634 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3635 child = Fmake_extent (Qnil, Qnil, result_str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3636 Fputhash (extent, child, buf->modeline_extent_table);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3637 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3638 Fset_extent_parent (child, extent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3639 set_extent_endpoints
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3640 (XEXTENT (child),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3641 Dynarr_at (formatted_string_extent_start_dynarr, elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3642 Dynarr_at (formatted_string_extent_end_dynarr, elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3643 result_str);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3644 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3645 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3646 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3647
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3648 static Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3649 add_string_to_fstring_db_runes (pos_data *data, CONST Bufbyte *str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3650 Charcount pos, Charcount min, Charcount max)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3651 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3652 /* This function has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3653 Charcount end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3654 CONST Bufbyte *cur_pos = str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3655 struct display_block *db = data->db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3656
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3657 data->blank_width = space_width (XWINDOW (data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3658 while (Dynarr_length (db->runes) < pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3659 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3661 end = (Dynarr_length (db->runes) +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3662 bytecount_to_charcount (str, strlen ((CONST char *) str)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3663 if (max != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3664 end = min (max, end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3665
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3666 while (pos < end && *cur_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3667 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3668 CONST Bufbyte *old_cur_pos = cur_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3669 int succeeded;
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->ch = charptr_emchar (cur_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3672 succeeded = (add_emchar_rune (data) != ADD_FAILED);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3673 INC_CHARPTR (cur_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3674 if (succeeded)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3675 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3676 pos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3677 data->modeline_charpos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3678 data->bytepos += cur_pos - old_cur_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3679 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3680 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3681
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3682 while (Dynarr_length (db->runes) < min &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3683 (data->pixpos + data->blank_width <= data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3684 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3685
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3686 return Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3687 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3689 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3690 modeline extents. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3691 static Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3692 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3693 Charcount pos, Charcount min, Charcount max)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3694 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3695 /* This function has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3696 Charcount end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3697 struct display_block *db = data->db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3698 struct glyph_block gb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3699
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3700 data->blank_width = space_width (XWINDOW (data->window));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3701 while (Dynarr_length (db->runes) < pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3702 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3703
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3704 end = Dynarr_length (db->runes) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3705 if (max != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3706 end = min (max, end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3707
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3708 gb.glyph = glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3709 gb.extent = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3710 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3711 pos++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3712
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3713 while (Dynarr_length (db->runes) < pos &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3714 (data->pixpos + data->blank_width <= data->max_pixpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3715 add_blank_rune (data, NULL, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3716
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3717 return Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3718 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3719
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3720 /* 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
3721 true of max_pixsize. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3722 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3723 if (Dynarr_length (data->db->runes)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3724 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3725 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3726 cur_pixsize = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3727
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3728 /* Note that this function does "positions" in terms of characters and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3729 not in terms of columns. This is necessary to make the formatting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3730 work correctly when proportional width fonts are used in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3731 modeline. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3732 static Charcount
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3733 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3734 Charcount min_pos, Charcount max_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3735 Lisp_Object elt, int depth, int max_pixsize,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3736 face_index findex, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3737 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3738 /* This function has been Mule-ized. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3739 /* #### The other losing things in this function are:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3740
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3741 -- C zero-terminated-string lossage.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3742 -- Non-printable characters should be converted into something
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3743 appropriate (e.g. ^F) instead of blindly being printed anyway.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3744 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3745
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3746 tail_recurse:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3747 if (depth > 10)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3748 goto invalid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3749
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3750 depth++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3751
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3752 if (STRINGP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3753 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3754 /* A string. Add to the display line and check for %-constructs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3755 within it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3757 Bufbyte *this = string_data (XSTRING (elt));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3759 while ((pos < max_pos || max_pos == -1) && *this)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3760 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3761 Bufbyte *last = this;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3762
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3763 while (*this && *this != '%')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3764 this++;
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 (this != last)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3767 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3768 /* The string is just a string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3769 Charcount size =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3770 bytecount_to_charcount (last, this - last) + pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3771 Charcount tmp_max = (max_pos == -1 ? size : min (size, max_pos));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3772
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3773 pos = add_string_to_fstring_db_runes (data, last, pos, pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3774 tmp_max);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3775 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3776 else /* *this == '%' */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3777 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3778 Charcount spec_width = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3779
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3780 this++; /* skip over '%' */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3782 /* We can't allow -ve args due to the "%-" construct.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3783 * Argument specifies minwidth but not maxwidth
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3784 * (maxwidth can be specified by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3785 * (<negative-number> . <stuff>) modeline elements)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3786 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3787 while (isdigit (*this))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3788 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3789 spec_width = spec_width * 10 + (*this - '0');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3790 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 spec_width += pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3794 if (*this == 'M')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3795 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3796 pos = generate_fstring_runes (w, data, pos, spec_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3797 max_pos, Vglobal_mode_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3798 depth, max_pixsize, findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3799 type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3800 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3801 else if (*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 Charcount num_to_add;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3804
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3805 if (max_pixsize < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3806 num_to_add = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3807 else if (max_pos != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3808 num_to_add = max_pos - pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3809 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3810 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3811 int cur_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3812 int dash_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3813 Bufbyte ch = '-';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3814 SET_CURRENT_MODE_CHARS_PIXSIZE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3815
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3816 dash_pixsize =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3817 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3818 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3819
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3820 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3821 num_to_add++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3822 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3824 while (num_to_add--)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3825 pos = add_string_to_fstring_db_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3826 (data, (CONST Bufbyte *) "-", pos, pos, max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3827 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3828 else if (*this != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3829 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3830 Bufbyte *str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3831 Emchar ch = charptr_emchar (this);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3832 decode_mode_spec (w, ch, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3834 str = Dynarr_atp (mode_spec_bufbyte_string, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3835 pos = add_string_to_fstring_db_runes (data,str, pos, pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3836 max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3837 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3839 /* NOT this++. There could be any sort of character at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3840 the current position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3841 INC_CHARPTR (this);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3842 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3843
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3844 if (max_pixsize > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3845 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3846 int cur_pixsize;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3847 SET_CURRENT_MODE_CHARS_PIXSIZE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3849 if (cur_pixsize >= max_pixsize)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3850 break;
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 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3854 else if (SYMBOLP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3855 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3856 /* A symbol: process the value of the symbol recursively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3857 as if it appeared here directly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3858 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3859
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3860 if (!UNBOUNDP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3861 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3862 /* If value is a string, output that string literally:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3863 don't check for % within it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3864 if (STRINGP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3865 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3866 pos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3867 add_string_to_fstring_db_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3868 (data, string_data (XSTRING (tem)), pos, min_pos, max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3869 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3870 /* Give up right away for nil or t. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3871 else if (!EQ (tem, elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3872 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3873 elt = tem;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3874 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3875 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3876 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3877 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3878 else if (CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3879 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3880 /* A cons cell: four distinct cases.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3881 * If first element is a string or a cons, process all the elements
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3882 * and effectively concatenate them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3883 * If first element is a negative number, truncate displaying cdr to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3884 * at most that many characters. If positive, pad (with spaces)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3885 * to at least that many characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3886 * If first element is a symbol, process the cadr or caddr recursively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3887 * according to whether the symbol's value is non-nil or nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3888 * If first element is a face, process the cdr recursively
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3889 * without altering the depth.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3890 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3891 Lisp_Object car, tem;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3892
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3893 car = XCAR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3894 if (SYMBOLP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3895 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3896 elt = XCDR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3897 if (!CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3898 goto invalid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3899 tem = symbol_value_in_buffer (car, w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3900 /* elt is now the cdr, and we know it is a cons cell.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3901 Use its car if CAR has a non-nil value. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3902 if (!UNBOUNDP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3903 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3904 if (!NILP (tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3905 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3906 elt = XCAR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3907 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3908 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3909 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3910 /* Symbol's value is nil (or symbol is unbound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3911 * Get the cddr of the original list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3912 * and if possible find the caddr and use that.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3913 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3914 elt = XCDR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3915 if (NILP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3916 ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3917 else if (!CONSP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3918 goto invalid;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3919 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3920 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3921 elt = XCAR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3922 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3923 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3924 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3925 else if (INTP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3926 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3927 Charcount lim = XINT (car);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3928
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3929 elt = XCDR (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 if (lim < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3932 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3933 /* Negative int means reduce maximum width.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3934 * DO NOT change MIN_PIXPOS here!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3935 * (20 -10 . foo) should truncate foo to 10 col
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3936 * and then pad to 20.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3937 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3938 if (max_pos == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3939 max_pos = pos - lim;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3940 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3941 max_pos = min (max_pos, pos - lim);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3942 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3943 else if (lim > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3944 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3945 /* Padding specified. Don't let it be more than
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3946 * current maximum.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3947 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3948 lim += pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3949 if (max_pos != -1 && lim > max_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3950 lim = max_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3951 /* If that's more padding than already wanted, queue it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3952 * But don't reduce padding already specified even if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3953 * that is beyond the current truncation point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3954 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3955 if (lim > min_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3956 min_pos = lim;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3957 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3958 goto tail_recurse;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3959 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3960 else if (STRINGP (car) || CONSP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3961 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3962 int limit = 50;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3963 /* LIMIT is to protect against circular lists. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3964 while (CONSP (elt) && --limit > 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3965 && (pos < max_pos || max_pos == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3966 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3967 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3968 XCAR (elt), depth,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3969 max_pixsize, findex, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3970 elt = XCDR (elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3971 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3972 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3973 else if (EXTENTP (car))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3974 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3975 struct extent *ext = XEXTENT (car);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3977 if (EXTENT_LIVE_P (ext))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3978 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3979 face_index old_findex = data->findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3980 Lisp_Object face;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3981 Lisp_Object font_inst;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3982 face_index new_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3983 Bytecount start = data->bytepos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3984
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3985 face = extent_face (ext);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3986 if (FACEP (face))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3987 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3988 /* #### needs to merge faces, sigh */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3989 /* #### needs to handle list of faces */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3990 new_findex = get_builtin_face_cache_index (w, face);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3991 /* !!#### not right; needs to compute the max height of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3992 all the charsets */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3993 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3994 Vcharset_ascii);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3996 data->dl->ascent = max (data->dl->ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3997 XFONT_INSTANCE (font_inst)->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3998 data->dl->descent = max (data->dl->descent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3999 XFONT_INSTANCE (font_inst)->
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4000 descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4001 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4002 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4003 new_findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4004
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4005 data->findex = new_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4006 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4007 XCDR (elt), depth - 1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4008 max_pixsize, new_findex, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4009 data->findex = old_findex;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4010 Dynarr_add (formatted_string_extent_dynarr, ext);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4011 Dynarr_add (formatted_string_extent_start_dynarr, start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4012 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4013 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4014 }
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 if (GLYPHP (elt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4017 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4018 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4019 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4020 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4021 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4022 invalid:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4023 pos =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4024 add_string_to_fstring_db_runes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4025 (data, (CONST Bufbyte *) GETTEXT ("*invalid*"), pos, min_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4026 max_pos);
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 if (min_pos > pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4030 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4031 add_string_to_fstring_db_runes (data, (CONST Bufbyte *) "", pos, min_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4032 -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4033 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4034
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4035 return pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4036 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4038 /* The caller is responsible for freeing the returned string. */
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4039 Bufbyte *
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4040 generate_formatted_string (struct window *w, Lisp_Object format_str,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4041 Lisp_Object result_str, face_index findex, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4042 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4043 struct display_line *dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4044 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4045 int elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4047 dl = &formatted_string_display_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4048 db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4049 Dynarr_reset (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4050
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4051 generate_formatted_string_db (format_str, result_str, w, dl, db, findex, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4052 -1, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4053
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4054 Dynarr_reset (formatted_string_emchar_dynarr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4055 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4056 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4057 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4058 Dynarr_add (formatted_string_emchar_dynarr,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4059 Dynarr_atp (db->runes, elt)->object.chr.ch);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4060 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4061 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4062
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4063 return
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4064 convert_emchar_string_into_malloced_string
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4065 ( Dynarr_atp (formatted_string_emchar_dynarr, 0),
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
4066 Dynarr_length (formatted_string_emchar_dynarr), 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4067 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4068
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4069 /* Update just the modeline. Assumes the desired display structs. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4070 they do not have a modeline block, it does nothing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4071 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4072 regenerate_modeline (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4073 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4074 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4075
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4076 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4077 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4078 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4079 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4080 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4081 redisplay_update_line (w, 0, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4082 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4083 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4084
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4085 /* Make sure that modeline display line is present in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4086 display structs if the window has a modeline and update that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4087 line. Returns true if a modeline was needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4088 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4089 ensure_modeline_generated (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4090 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4091 int need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4092
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4093 /* minibuffer windows don't have modelines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4094 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4095 need_modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4096 /* windows which haven't had it turned off do */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4097 else if (WINDOW_HAS_MODELINE_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4098 need_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4099 /* 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
4100 a horizontal scrollbar */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4101 else if (window_scrollbar_height (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4102 need_modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4103 /* and in this case there is none */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4104 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4105 need_modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4106
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4107 if (need_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4108 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4109 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4111 dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4112
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4113 /* We don't care if there is a display line which is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4114 currently a modeline because it is definitely going to become
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4115 one if we have gotten to this point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4116 if (Dynarr_length (dla) == 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4117 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4118 if (Dynarr_largest (dla) > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4119 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4120 struct display_line *mlp = Dynarr_atp (dla, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4121 Dynarr_add (dla, *mlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4122 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4123 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4124 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4125 struct display_line modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4126 memset (&modeline, 0, sizeof (struct display_line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4127 Dynarr_add (dla, modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4128 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4129 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4131 /* If we're adding a new place marker go ahead and generate the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4132 modeline so that it is available for use by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4133 window_modeline_height. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4134 generate_modeline (w, Dynarr_atp (dla, 0), type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4135 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4136
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4137 return need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4138 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4139
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4140 /* #### Kludge or not a kludge. I tend towards the former. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4141 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4142 real_current_modeline_height (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4143 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4144 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
4145 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4146
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4147 if (ensure_modeline_generated (w, CMOTION_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4148 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4149 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4151 dla = window_display_lines (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4153 if (Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4154 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4155 if (Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4156 return (Dynarr_atp (dla, 0)->ascent +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4157 Dynarr_atp (dla, 0)->descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4158 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4159 return 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 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4162 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4163 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4164 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4165 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4166 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4167
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4168
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4169 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4170 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4171 /* window-regeneration routines */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4172 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4173 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4174
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4175 /* For a given window and starting position in the buffer it contains,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4176 ensure that the TYPE display lines accurately represent the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4177 presentation of the window. We pass the buffer instead of getting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4178 it from the window since redisplay_window may have temporarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4179 changed it to the echo area buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4180
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4181 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4182 regenerate_window (struct window *w, Bufpos start_pos, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4183 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4184 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4185 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4186 int ypos = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4187 int yend; /* set farther down */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4188
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4189 prop_block_dynarr *prop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4190 layout_bounds bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4191 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4192 int need_modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4194 /* The lines had better exist by this point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4195 if (!(dla = window_display_lines (w, type)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4196 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4197 Dynarr_reset (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4198 w->max_line_len = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4200 /* Normally these get updated in redisplay_window but it is possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4201 for this function to get called from some other points where that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4202 update may not have occurred. This acts as a safety check. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4203 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4204 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4205 if (!Dynarr_length (w->glyph_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4206 reset_glyph_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4208 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4209 Fset_marker (w->pointm[type], make_int (point), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4210 w->last_point_x[type] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4211 w->last_point_y[type] = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4212
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4213 /* Make sure a modeline is in the structs if needed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4214 need_modeline = ensure_modeline_generated (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4216 /* Wait until here to set this so that the structs have a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4217 generated in the case where one didn't exist. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4218 yend = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4219
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4220 bounds = calculate_display_line_boundaries (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4222 if (MINI_WINDOW_P (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4223 && !NILP (Vminibuf_prompt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4224 && !echo_area_active (f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4225 && start_pos == BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4226 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4227 struct prop_block pb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4228 prop = Dynarr_new (struct prop_block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4230 pb.type = PROP_MINIBUF_PROMPT;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4231 pb.data.p_string.str = string_data (XSTRING (Vminibuf_prompt));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4232 pb.data.p_string.len = string_length (XSTRING (Vminibuf_prompt));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4233 Dynarr_add (prop, pb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4234 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4235 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4236 prop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4237
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4238 while (ypos < yend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4239 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4240 struct display_line dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4241 struct display_line *dlp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4242 int local;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4243
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4244 if (Dynarr_length (dla) < Dynarr_largest (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4245 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4246 dlp = Dynarr_atp (dla, Dynarr_length (dla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4247 local = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4248 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4249 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4250 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4251 dlp = &dl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4252 memset (dlp, 0, sizeof (struct display_line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4253 local = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4254 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4255
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4256 dlp->bounds = bounds;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4257 dlp->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4258 start_pos = generate_display_line (w, dlp, 1, start_pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4259 w->hscroll, &prop, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4260 dlp->ypos = ypos + dlp->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4261 ypos = dlp->ypos + dlp->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4263 if (ypos > yend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4264 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4265 int visible_height = dlp->ascent + dlp->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4266
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4267 dlp->clip = (ypos - yend);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4268 visible_height -= dlp->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4270 if (visible_height < VERTICAL_CLIP (w, 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 if (local)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4273 free_display_line (dlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4274 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4275 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4276 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4277 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4278 dlp->clip = 0;
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 (dlp->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4281 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4282 /* #### This check is steaming crap. Have to get things
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4283 fixed so when create_text_block hits EOB, we're done,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4284 period. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4285 if (w->last_point_x[type] == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4286 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4287 w->last_point_x[type] = dlp->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4288 w->last_point_y[type] = Dynarr_length (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4289 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4290 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4291 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4292 /* #### This means that we've added a cursor at EOB
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4293 twice. Yuck oh yuck. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4294 struct display_block *db =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4295 get_display_block_from_line (dlp, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4297 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4298 dlp->cursor_elt = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4299 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4300 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4301
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4302 if (dlp->num_chars > w->max_line_len)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4303 w->max_line_len = dlp->num_chars;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4304
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4305 Dynarr_add (dla, *dlp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4307 /* #### This isn't right, but it is close enough for now. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4308 w->window_end_pos[type] = start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4309
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4310 /* #### This type of check needs to be done down in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4311 generate_display_line call. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4312 if (start_pos > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4313 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4314 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4315
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4316 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4317 Dynarr_free (prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4319 /* #### More not quite right, but close enough. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4320 /* #### Ben sez: apparently window_end_pos[] is measured
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4321 as the number of characters between the window end and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4322 end of the buffer? This seems rather weirdo. What's
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4323 the justification for this? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4324 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4325
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4326 if (need_modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4327 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4328 /* 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
4329 there when we first started working in this function. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4330 generate_modeline (w, Dynarr_atp (dla, 0), type);
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4334 #define REGEN_INC_FIND_START_END \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4335 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4336 /* Determine start and end of lines. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4337 if (!Dynarr_length (cdla)) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4338 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4339 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4340 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4341 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4342 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4343 dla_start = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4344 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4345 else if (!Dynarr_atp (cdla, 0)->modeline \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4346 && !Dynarr_atp (ddla, 0)->modeline) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4347 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4348 dla_start = 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4349 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4350 else \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4351 abort (); /* structs differ */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4352 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4353 dla_end = Dynarr_length (cdla) - 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4354 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4355 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4356 start_pos = (Dynarr_atp (cdla, dla_start)->bufpos \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4357 + Dynarr_atp (cdla, dla_start)->offset); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4358 /* 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
4359 full regen. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4360 if (startp != start_pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4361 return 0; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4362 \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4363 /* Point is outside the visible region so give up. */ \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4364 if (pointm < start_pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4365 return 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 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4369 /* This attempts to incrementally update the display structures. It
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4370 returns a boolean indicating success or failure. This function is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4371 very similar to regenerate_window_incrementally and is in fact only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4372 called from that function. However, because of the nature of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4373 changes it deals with it sometimes makes different assumptions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4374 which can lead to success which are much more difficult to make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4375 when dealing with buffer changes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4376
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4377 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4378 regenerate_window_extents_only_changed (struct window *w, Bufpos startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4379 Bufpos pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4380 Charcount beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4381 Charcount end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4382 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4383 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4384 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4385 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4386
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4387 int dla_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4388 int dla_end, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4389 int first_line, last_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4390 Bufpos start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4391 /* Don't define this in the loop where it is used because we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4392 definitely want its value to survive between passes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4393 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4394
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4395 /* 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
4396 been incremented, then fail. I'm not sure of the exact circumstances
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4397 under which this can happen, but I believe that it is probably a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4398 reasonable happening. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4399 if (!point_visible (w, pointm, CURRENT_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4400 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4401 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4402
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4403 /* 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
4404 go ahead and proceed with the optimization attempt. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4405 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4406 || pointm != marker_position (w->last_point[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4407 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4408 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4409 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4410 struct frame *sel_f = device_selected_frame (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4411 int success = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4412
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4413 if (w->last_point_x[CURRENT_DISP] != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4414 && w->last_point_y[CURRENT_DISP] != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4415 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4416
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4417 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4418 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4419 /* Always regenerate the modeline in case it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4420 displaying the current line or column. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4421 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4422 success = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4423 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4424 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4425 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4426 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4427 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4428 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4429 success = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4430 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4431
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4432 if (!success)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4433 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4434 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4435
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4436 if (beg_unchanged == -1 && end_unchanged == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4437 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4438
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4439 /* assert: There are no buffer modifications or they are all below the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4440 visible region. We assume that regenerate_window_incrementally has
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4441 not called us unless this is true. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4442
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4443 REGEN_INC_FIND_START_END;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4445 /* If the changed are starts before the visible area, give up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4446 if (beg_unchanged < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4447 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4449 /* Find what display line the extent changes first affect. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4450 line = dla_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4451 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4452 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4453 struct display_line *dl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4454 Bufpos lstart = dl->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4455 Bufpos lend = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4456
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4457 if (beg_unchanged >= lstart && beg_unchanged <= lend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4458 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4459
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4460 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4461 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4462
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4463 /* If the changes are below the visible area then if point hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4464 moved return success otherwise fail in order to be safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4465 if (line > dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4466 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4467 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4468 && pointm == marker_position (w->last_point[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4469 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4470 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4471 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4472 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4474 /* At this point we know what line the changes first affect. We now
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4475 begin redrawing lines as long as we are still in the affected
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4476 region and the line's size and positioning don't change.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4477 Otherwise we fail. If we fail we will have altered the desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4478 structs which could lead to an assertion failure. However, if we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4479 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
4480 will actually end up being safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4481 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4482 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4483 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4484 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4485
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4486 first_line = last_line = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4487 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4488 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4489 Bufpos old_start, old_end, new_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4490 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4491 struct display_line *ddl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4492 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4493 int initial_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4494
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4495 assert (cdl->bufpos == ddl->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4496 assert (cdl->end_bufpos == ddl->end_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4497 assert (cdl->offset == ddl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4498
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4499 db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4500 initial_size = Dynarr_length (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4501 old_start = ddl->bufpos + ddl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4502 old_end = ddl->end_bufpos + ddl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4504 /* If this is the first line being updated and it used
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4505 propagation data, fail. Otherwise we'll be okay because
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4506 we'll have the necessary propagation data. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4507 if (line == first_line && ddl->used_prop_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4508 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4509
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4510 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4511 w->hscroll, &prop, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4512 ddl->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4513
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4514 /* #### If there is propagated stuff the fail. We could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4515 probably actually deal with this if the line had propagated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4516 information when originally created by a full
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4517 regeneration. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4518 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4519 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4520 Dynarr_free (prop);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4521 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4522 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4524 /* If any line position parameters have changed or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4525 cursor has disappeared or disappeared, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4526 db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4527 if (cdl->ypos != ddl->ypos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4528 || cdl->ascent != ddl->ascent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4529 || cdl->descent != ddl->descent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4530 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4531 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4532 || old_start != ddl->bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4533 || old_end != ddl->end_bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4534 || initial_size != Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4535 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4536 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4537 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4538
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4539 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4540 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4541 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4542 w->last_point_y[DESIRED_DISP] = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4543 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4544
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4545 last_line = line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4546
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4547 /* If the extent changes end on the line we just updated then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4548 we're done. Otherwise go on to the next line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4549 if (end_unchanged <= ddl->end_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4550 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4551 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4552 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4553 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4554
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4555 redisplay_update_line (w, first_line, last_line, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4556 return 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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4559 /* Attempt to update the display data structures based on knowledge of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4560 the changed region in the buffer. Returns a boolean indicating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4561 success or failure. If this function returns a failure then a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4562 regenerate_window _must_ be performed next in order to maintain
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4563 invariants located here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4564
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4565 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4566 regenerate_window_incrementally (struct window *w, Bufpos startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4567 Bufpos pointm)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4568 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4569 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4570 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4571 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4572 Charcount beg_unchanged, end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4573 Charcount extent_beg_unchanged, extent_end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4574
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4575 int dla_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4576 int dla_end, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4577 Bufpos start_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4578
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4579 /* If this function is called, the current and desired structures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4580 had better be identical. If they are not, then that is a bug. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4581 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4582
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4583 /* We don't handle minibuffer windows yet. The minibuffer prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4584 screws us up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4585 if (MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4586 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4587
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4588 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4589 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4590 ? -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4591 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4592
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4593 /* If nothing has changed in the buffer, then make sure point is ok
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4594 and succeed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4595 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4596 return regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4597 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4598 extent_end_unchanged);
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 can't deal with deleted newlines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4601 if (BUF_NEWLINE_WAS_DELETED (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4602 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4603
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4604 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4605 end_unchanged = (BUF_END_UNCHANGED (b) == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4606 ? -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4607 : BUF_Z (b) - BUF_END_UNCHANGED (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4609 REGEN_INC_FIND_START_END;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4611 /* If the changed area starts before the visible area, give up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4612 if (beg_unchanged < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4613 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4614
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4615 /* Find what display line the buffer changes first affect. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4616 line = dla_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4617 while (line <= dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4618 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4619 struct display_line *dl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4620 Bufpos lstart = dl->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4621 Bufpos lend = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4623 if (beg_unchanged >= lstart && beg_unchanged <= lend)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4624 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4625
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4626 line++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4627 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4629 /* If the changes are below the visible area then if point hasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4630 moved return success otherwise fail in order to be safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4631 if (line > dla_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4632 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4633 return regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4634 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4635 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4636 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4637 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4638 /* At this point we know what line the changes first affect. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4639 now redraw that line. If the changes are contained within it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4640 we are going to succeed and can update just that one line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4641 Otherwise we fail. If we fail we will have altered the desired
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4642 structs which could lead to an assertion failure. However, if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4643 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
4644 so we will actually end up being safe. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4645 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4646 Bufpos new_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4647 prop_block_dynarr *prop = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4648 struct display_line *cdl = Dynarr_atp (cdla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4649 struct display_line *ddl = Dynarr_atp (ddla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4650
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4651 assert (cdl->bufpos == ddl->bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4652 assert (cdl->end_bufpos == ddl->end_bufpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4653 assert (cdl->offset == ddl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4654
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4655 /* If the last rune is already a continuation glyph, fail.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4656 #### We should be able to handle this better. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4657 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4658 struct display_block *db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4659 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4660 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4661 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4662 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4663
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4664 if (rb->type == RUNE_DGLYPH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4665 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4666 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4667 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4668 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4669
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4670 /* If the line was generated using propagation data, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4671 if (ddl->used_prop_data)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4672 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4673
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4674 new_start = generate_display_line (w, ddl, 0, ddl->bufpos + ddl->offset,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4675 w->hscroll, &prop, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4676 ddl->offset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4677
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4678 /* If there is propagated stuff then it is pretty much a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4679 guarantee that more than just the one line is affected. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4680 if (prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4681 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4682 Dynarr_free (prop);
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 /* If the last rune is now a continuation glyph, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4687 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4688 struct display_block *db = get_display_block_from_line (ddl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4689 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4690 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4691 struct rune *rb =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4692 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4693
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4694 if (rb->type == RUNE_DGLYPH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4695 && EQ (rb->object.dglyph.glyph, Vcontinuation_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4696 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4697 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4698 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4699
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4700 /* If any line position parameters have changed or a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4701 cursor has disappeared or disappeared, fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4702 if (cdl->ypos != ddl->ypos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4703 || cdl->ascent != ddl->ascent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4704 || cdl->descent != ddl->descent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4705 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4706 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4707 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4708 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4709 }
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 the changed area also ends on this line, then we may be in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4712 business. Update everything and return success. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4713 if (end_unchanged >= ddl->bufpos && end_unchanged <= ddl->end_bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4714 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4715 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4716 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4717 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4718 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4719 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4720 w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4721
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4722 if (ddl->cursor_elt != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4723 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4724 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4725 w->last_point_y[DESIRED_DISP] = line;
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 redisplay_update_line (w, line, line, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4729 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4730
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4731 /* #### For now we just flush the cache until this has been
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4732 tested. After that is done, this should correct the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4733 cache directly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4734 Dynarr_reset (w->line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4735
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4736 /* Adjust the extent changed boundaries to remove any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4737 overlap with the buffer changes since we've just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4738 successfully updated that area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4739 if (extent_beg_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4740 && extent_beg_unchanged >= beg_unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4741 && extent_beg_unchanged < end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4742 extent_beg_unchanged = end_unchanged;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4743
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4744 if (extent_end_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4745 && extent_end_unchanged >= beg_unchanged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4746 && extent_end_unchanged < end_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4747 extent_end_unchanged = beg_unchanged - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4748
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4749 if (extent_end_unchanged <= extent_beg_unchanged)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4750 extent_beg_unchanged = extent_end_unchanged = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4751
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4752 /* This could lead to odd results if it fails, but since the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4753 buffer changes update succeeded this probably will to.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4754 We already know that the extent changes start at or after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4755 the line because we checked before entering the loop. */
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_end_unchanged != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4758 && ((extent_beg_unchanged < ddl->bufpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4759 || (extent_end_unchanged > ddl->end_bufpos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4760 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4761 return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4762 regenerate_window_extents_only_changed (w, startp, pointm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4763 extent_beg_unchanged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4764 extent_end_unchanged);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4765 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4766 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4767 return 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 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4771 /* Oh, well. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4772 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4773 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4774
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4775 /* Given a window and a point, update the given display lines such
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4776 that point is displayed in the middle of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4777
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4778 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4779 regenerate_window_point_center (struct window *w, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4780 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4781 Bufpos startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4782
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4783 /* We need to make sure that the modeline is generated so that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4784 window height can be calculated correctly. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4785 ensure_modeline_generated (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4786
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4787 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4788 regenerate_window (w, startp, point, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4789 Fset_marker (w->start[type], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4791 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4792 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4794 /* Given a window and a set of display lines, return a boolean
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4795 indicating whether the given point is contained within. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4797 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4798 point_visible (struct window *w, Bufpos point, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4799 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4800 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4801 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4802 int first_line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4803
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4804 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4805 first_line = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4806 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4807 first_line = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4808
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4809 if (Dynarr_length (dla) > first_line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4810 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4811 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4812 struct display_line *dl = Dynarr_atp (dla, first_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4814 start = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4815 end = BUF_Z (b) - w->window_end_pos[type] - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4816
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4817 if (point >= start && point <= end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4818 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4819 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4820 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4821 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4822
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4823 if (point >= (dl->bufpos + dl->offset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4824 && point <= (dl->end_bufpos + dl->offset))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4825 return (!dl->clip);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4826 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4827 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4828 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4829 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4830 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4831 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4832 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4833 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4834 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4835 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4836 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4837 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4839 /* Return pixel position the middle of the window, not including the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4840 modeline and any potential horizontal scrollbar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4841
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4842 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4843 window_half_pixpos (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4844 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4845 return (WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4846 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4847
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4848 /* Return the display line which is currently in the middle of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4849 window W for display lines TYPE. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4850
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4851 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4852 line_at_center (struct window *w, int type, Bufpos start, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4853 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4854 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4855 int half;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4856 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4857 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4858
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4859 if (type == CMOTION_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4860 regenerate_window (w, start, point, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4862 dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4863 half = window_half_pixpos (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4864
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4865 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4866 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4867 struct display_line *dl = Dynarr_atp (dla, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4868 int line_bot = dl->ypos + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4869
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4870 if (line_bot > half)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4871 return elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4872 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4873
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4874 /* 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
4875 being displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4876 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4877 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4878
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4879 /* Return a value for point that would place it at the beginning of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4880 the line which is in the middle of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4881
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4882 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4883 point_at_center (struct window *w, int type, Bufpos start, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4884 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4885 /* line_at_center will regenerate the display structures, if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4886 int line = line_at_center (w, type, start, point);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4887
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4888 if (line == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4889 return BUF_ZV (XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4890 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4891 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4892 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4893 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4894
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4895 return dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4896 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4897 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4898
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4899 /* For a given window, ensure that the current visual representation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4900 is accurate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4901
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4902 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4903 redisplay_window (Lisp_Object window, int skip_selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4904 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4905 struct window *w = XWINDOW (window);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4906 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4907 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4908 Lisp_Object old_buffer = w->buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4909 struct buffer *b;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4910 int echo_active = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4911 int startp = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4912 int pointm;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4913 int selected;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4914 int skip_output = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4915 int truncation_changed;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4916 int inactive_minibuffer =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4917 (MINI_WINDOW_P (w) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4918 (f != device_selected_frame (d)) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4919 !is_surrogate_for_selected_frame (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4920
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4921 /* #### In the new world this function actually does a bunch of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4922 optimizations such as buffer-based scrolling, but none of that is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4923 implemented yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4924
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4925 /* If this is a combination window, do its children; that's all.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4926 The selected window is always a leaf so we don't check for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4927 skip_selected here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4928 if (!NILP (w->vchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4929 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4930 redisplay_windows (w->vchild, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4931 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4932 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4933 if (!NILP (w->hchild))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4934 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4935 redisplay_windows (w->hchild, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4936 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4937 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4938
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4939 /* Is this window the selected window on its frame? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4940 selected =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4941 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4942 if (skip_selected && selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4943 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4944
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4945 /* It is possible that the window is not fully initialized yet. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4946 if (NILP (w->buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4947 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4948
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4949 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4950 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4951 w->buffer = Vecho_area_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4952 echo_active = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4953 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4954
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4955 b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4956
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4957 if (echo_active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4958 pointm = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4959 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4960 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4961 if (selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4962 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4963 pointm = BUF_PT (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4964 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4965 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4966 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4967 pointm = marker_position (w->pointm[CURRENT_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4968
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4969 if (pointm < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4970 pointm = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4971 else if (pointm > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4972 pointm = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4973 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4974 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4975 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), old_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4976
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4977 /* If the buffer has changed we have to invalid all of our face
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4978 cache elements. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4979 if ((!echo_active && b != window_display_buffer (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4980 || !Dynarr_length (w->face_cachels)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4981 || f->faces_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4982 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4983 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4984 mark_face_cachels_as_not_updated (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4985
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4986 /* Ditto the glyph cache elements. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4987 if ((!echo_active && b != window_display_buffer (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4988 || !Dynarr_length (w->glyph_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4989 reset_glyph_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4990 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4991 mark_glyph_cachels_as_not_updated (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4992
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4993 /* 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
4994 to find a new starting position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4995 if (!MINI_WINDOW_P (w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4996 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4997 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4998 regenerate_window_point_center (w, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5000 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5001 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5002
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5003 if (echo_active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5004 startp = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5005 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5006 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5007 startp = marker_position (w->start[CURRENT_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5008 if (startp < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5009 startp = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5010 else if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5011 startp = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5012 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5013 Fset_marker (w->start[DESIRED_DISP], make_int (startp), old_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5014
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5015 truncation_changed = (find_window_mirror (w)->truncate_win !=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5016 window_truncation_on (w));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5017
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5018 /* 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
5019 should display from there and change point, if necessary, to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5020 ensure that it is visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5021 if (w->force_start || inactive_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5022 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5023 w->force_start = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5024 w->last_modified[DESIRED_DISP] = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5025 w->last_facechange[DESIRED_DISP] = Qzero;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5026
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5027 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5028
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5029 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5030 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5031 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5032
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5033 if (selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5034 BUF_SET_PT (b, pointm);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5035
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5036 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5037 old_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5038
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5039 /* #### BUFU amounts of overkil just to get the cursor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5040 location marked properly. FIX ME FIX ME FIX ME */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5041 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5042 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5043
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5044 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5045 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5046
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5047 /* If nothing has changed since the last redisplay, then we just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5048 need to make sure that point is still visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5049 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5050 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5051 && pointm >= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5052 /* This check is to make sure we restore the minibuffer after a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5053 temporary change to the echo area. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5054 && !(MINI_WINDOW_P (w) && f->buffers_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5055 && !f->frame_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5056 && !truncation_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5057 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5058 /* Check if the cursor has actually moved. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5059 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5060 && pointm == marker_position (w->last_point[CURRENT_DISP])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5061 && selected
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5062 && !w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5063 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5064 && !f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5065 && !f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5066 && !f->point_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5067 && !f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5068 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5069 /* If not, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5070 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5071 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5073 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5074 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5075 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5076 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5077 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5078 /* If the new point is visible in the redisplay structures,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5079 then let the output update routines handle it, otherwise
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5080 do things the hard way. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5081 if (!w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5082 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5083 && !f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5084 && !f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5085 && !f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5086 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5087 if (point_visible (w, pointm, CURRENT_DISP)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5088 && w->last_point_x[CURRENT_DISP] != -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5089 && w->last_point_y[CURRENT_DISP] != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5090 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5091 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5092 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5093 /* Always regenerate in case it is displaying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5094 the current line or column. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5095 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5096
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5097 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5098 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5099 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5100 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5101 else if (!selected && !f->point_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5102 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5103 if (f->modeline_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5104 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5106 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5107 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5108 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5109 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5111 /* If we weren't able to take the shortcut method, then use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5112 the brute force method. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5113 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5114
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5115 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5116 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5117 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5118 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5120 /* Check if the starting point is no longer at the beginning of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5121 line, in which case find a new starting point. We also recenter
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5122 if our start position is equal to point-max. Otherwise we'll end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5123 up with a blank window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5124 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5125 && !(startp == BUF_BEGV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5126 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5127 || (pointm == startp &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5128 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5129 startp < marker_position (w->last_start[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5130 || (startp == BUF_ZV (b)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5131 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5132 regenerate_window_point_center (w, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5133
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5134 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5135 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5136 /* See if we can update the data structures locally based on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5137 knowledge of what changed in the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5138 else if (!w->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5139 && !f->clip_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5140 && !f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5141 && !f->windows_structure_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5142 && !f->frame_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5143 && !truncation_changed
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 && regenerate_window_incrementally (w, startp, pointm))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5146 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5147 if (f->modeline_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5148 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5149 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5150 regenerate_modeline (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5151
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5152 skip_output = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5153 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5154 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5155 /* #### This is where a check for structure based scrolling would go. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5156 /* If all else fails, try just regenerating and see what happens. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5157 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5158 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5159 regenerate_window (w, startp, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5160
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5161 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5162 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5163 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5164
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5165 /* We still haven't gotten the window regenerated with point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5166 visible. Next we try scrolling a little and see if point comes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5167 back onto the screen. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5168 if (scroll_step)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5169 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5170 Bufpos bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5172 bufpos = vmotion (w, startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5173 (pointm < startp) ? -scroll_step : scroll_step, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5174 regenerate_window (w, bufpos, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5175
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5176 if (point_visible (w, pointm, DESIRED_DISP))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5177 goto regeneration_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5178 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5180 /* We still haven't managed to get the screen drawn with point on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5181 the screen, so just center it and be done with it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5182 regenerate_window_point_center (w, pointm, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5183
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5185 regeneration_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5186
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5187 /* If the window's frame is changed then reset the current display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5188 lines in order to force a full repaint. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5189 if (f->frame_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5190 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5191 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5193 Dynarr_reset (cla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5194 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5196 /* Must do this before calling redisplay_output_window because it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5197 sets some markers on the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5198 if (MINI_WINDOW_P (w) && echo_area_active (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5199 w->buffer = old_buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5201 /* These also have to be set before calling redisplay_output_window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5202 since it sets the CURRENT_DISP values based on them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5203 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5204 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5205 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5206 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5207
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5208 if (!skip_output)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5209 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5210 Bufpos start = marker_position (w->start[DESIRED_DISP]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5211 Bufpos end = (w->window_end_pos[DESIRED_DISP] == -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5212 ? BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5213 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5214
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5215 update_line_start_cache (w, start, end, pointm, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5216 redisplay_output_window (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5217 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5219 /* #### This should be dependent on face changes and will need to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5220 somewhere else once tty updates occur on a per-frame basis. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5221 mark_face_cachels_as_clean (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5222
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5223 w->windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5224 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5225
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5226 /* Call buffer_reset_changes for all buffers present in any window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5227 currently visible in all frames on all devices. #### There has to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5228 be a better way to do this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5229
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5230 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5231 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5232 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5233 buffer_reset_changes (XBUFFER (w->buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5234 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5235 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5237 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5238 reset_buffer_changes (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5239 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5240 Lisp_Object frmcons, devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5242 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5243 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5244 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5245
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5246 if (FRAME_VISIBLE_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5247 map_windows (f, reset_buffer_changes_mapfun, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5248 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5249 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5251 /* Ensure that all windows underneath the given window in the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5252 hierarchy are correctly displayed. */
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 redisplay_windows (Lisp_Object window, int skip_selected)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5256 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5257 for (; !NILP (window) ; window = XWINDOW (window)->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5258 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5259 redisplay_window (window, skip_selected);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5260 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5261 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5263 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5264 call_redisplay_end_triggers (struct window *w, void *closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5265 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5266 Bufpos lrpos = w->last_redisplay_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5267 w->last_redisplay_pos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5268 if (!NILP (w->buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5269 && !NILP (w->redisplay_end_trigger)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5270 && lrpos > 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5271 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5272 Bufpos pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5273
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5274 if (MARKERP (w->redisplay_end_trigger)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5275 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5276 pos = marker_position (w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5277 else if (INTP (w->redisplay_end_trigger))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5278 pos = XINT (w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5279 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5280 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5281 w->redisplay_end_trigger = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5282 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5283 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5284
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5285 if (lrpos >= pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5286 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5287 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5288 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5289 va_run_hook_with_args_in_buffer (XBUFFER (w->buffer),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5290 Qredisplay_end_trigger_functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5291 2, window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5292 w->redisplay_end_trigger);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5293 w->redisplay_end_trigger = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5294 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5295 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5297 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5298 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5299
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5300 /* Ensure that all windows on the given frame are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5301
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5302 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5303 redisplay_frame (struct frame *f, int preemption_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5304 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5305 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5307 if (preemption_check)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5308 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5309 /* The preemption check itself takes a lot of time,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5310 so normally don't do it here. We do it if called
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5311 from Lisp, though (`redisplay-frame'). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5312 int preempted;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5314 REDISPLAY_PREEMPTION_CHECK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5315 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5316 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5317 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5319 /* Before we put a hold on frame size changes, attempt to process
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5320 any which are already pending. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5321 if (f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5322 change_frame_size (f, f->new_height, f->new_width, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5323
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5324 /* The menubar, toolbar, and icon updates must be done before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5325 hold_frame_size_changes is called and we are officially
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5326 'in_display'. They may eval lisp code which may call Fsignal.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5327 If in_display is set Fsignal will abort. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5328
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5329 #ifdef HAVE_MENUBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5330 /* Update the menubar. It is done first since it could change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5331 the menubar's visibility. This way we avoid having flashing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5332 caused by an Expose event generated by the visibility change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5333 being handled. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5334 update_frame_menubars (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5335 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5337 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5338 /* Update the toolbars. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5339 update_frame_toolbars (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5340 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5342 hold_frame_size_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5343
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5344 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5345 /* Within this section, we are defenseless and assume that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5346 following cannot happen:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5347
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5348 1) garbage collection
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5349 2) Lisp code evaluation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5350 3) frame size changes
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5351
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5352 We ensure (3) by calling hold_frame_size_changes(), which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5353 will cause any pending frame size changes to get put on hold
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5354 till after the end of the critical section. (1) follows
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5355 automatically if (2) is met. #### Unfortunately, there are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5356 some places where Lisp code can be called within this section.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5357 We need to remove them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5358
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5359 If Fsignal() is called during this critical section, we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5360 will abort().
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5361
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5362 If garbage collection is called during this critical section,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5363 we simply return. #### We should abort instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5364
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5365 #### If a frame-size change does occur we should probably
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5366 actually be preempting redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5367
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5368 /* 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
5369 if (f->clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5370 f->frame_changed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5371
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5372 /* Erase the frame before outputting its contents. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5373 if (f->clear)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5374 DEVMETH (d, clear_frame, (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5376 /* Do the selected window first. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5377 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5379 /* Then do the rest. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5380 redisplay_windows (f->root_window, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5382 /* We now call the output_end routine for tty frames. We delay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5383 doing so in order to avoid cursor flicker. So much for 100%
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5384 encapsulation. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5385 if (FRAME_TTY_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5386 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5387
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5388 update_frame_title (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5390 f->buffers_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5391 f->clip_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5392 f->extents_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5393 f->faces_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5394 f->frame_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5395 f->icon_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5396 f->menubar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5397 f->modeline_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5398 f->point_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5399 f->toolbar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5400 f->windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5401 f->windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5402 f->window_face_cache_reset = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5404 f->clear = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5406 if (!f->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5407 f->size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5409 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5410
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5411 /* Allow frame size changes to occur again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5412
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5413 #### what happens if changes to other frames happen? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5414 unhold_one_frame_size_changes (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5415
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5416 map_windows (f, call_redisplay_end_triggers, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5417 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5418 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5419
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5420 /* Ensure that all frames on the given device are correctly displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5421
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5422 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5423 redisplay_device (struct device *d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5424 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5425 Lisp_Object frame, frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5426 int preempted = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5427 int size_change_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5428 struct frame *f;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5430 if (DEVICE_STREAM_P (d)) /* nothing to do */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5431 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5432
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5433 /* It is possible that redisplay has been called before the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5434 device is fully initialized. If so then continue with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5435 next device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5436 if (NILP (DEVICE_SELECTED_FRAME (d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5437 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5438
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5439 REDISPLAY_PREEMPTION_CHECK;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5440 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5441 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5442
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5443 /* Always do the selected frame first. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5444 frame = DEVICE_SELECTED_FRAME (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5445
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5446 f = XFRAME (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5448 if (f->icon_changed || f->windows_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5449 update_frame_icon (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5451 if (FRAME_VISIBLE_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5452 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5453 if (f->buffers_changed || f->clip_changed || f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5454 || f->faces_changed || f->frame_changed || f->menubar_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5455 || f->modeline_changed || f->point_changed || f->size_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5456 || f->toolbar_changed || f->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5457 || f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5458 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5459 preempted = redisplay_frame (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5460 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5462 if (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5463 return 1;
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 the frame redisplay did not get preempted, then this flag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5466 should have gotten set to 0. It might be possible for that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5467 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
5468 time. To make sure we don't miss anything we simply don't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5469 reset the top level flags until the condition ends up being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5470 in the right state. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5471 if (f->size_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5472 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5473 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5475 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5476 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5477 f = XFRAME (XCAR (frmcons));
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 (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5480 continue;
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 (f->icon_changed || f->windows_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5483 update_frame_icon (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5484
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5485 if (FRAME_VISIBLE_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5486 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5487 if (f->buffers_changed || f->clip_changed || f->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5488 || f->faces_changed || f->frame_changed || f->menubar_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5489 || f->modeline_changed || f->point_changed || f->size_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5490 || f->toolbar_changed || f->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5491 || f->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5492 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5493 preempted = redisplay_frame (f, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5494 }
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 (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5497 return 1;
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->size_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5500 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5501 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5502 }
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 we get here then we redisplayed all of our frames without
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5505 getting preempted so mark ourselves as clean. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5506 d->buffers_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5507 d->clip_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5508 d->extents_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5509 d->faces_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5510 d->frame_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5511 d->icon_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5512 d->menubar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5513 d->modeline_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5514 d->point_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5515 d->toolbar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5516 d->windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5517 d->windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5519 if (!size_change_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5520 d->size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5521
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5522 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5523 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5524
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5525 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5526 restore_profiling_redisplay_flag (Lisp_Object val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5527 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5528 profiling_redisplay_flag = XINT (val);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5529 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5530 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5532 /* Ensure that all windows on all frames on all devices are displaying
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5533 the current contents of their respective buffers. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5534
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5535 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5536 redisplay_without_hooks (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5537 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5538 Lisp_Object devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5539 int size_change_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5540 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5542 if (profiling_active)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5543 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5544 record_unwind_protect (restore_profiling_redisplay_flag,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5545 make_int (profiling_redisplay_flag));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5546 profiling_redisplay_flag = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5547 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5549 if (asynch_device_change_pending)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5550 handle_asynch_device_change ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5551
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5552 if (!buffers_changed && !clip_changed && !extents_changed && !faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5553 && !frame_changed && !icon_changed && !menubar_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5554 && !modeline_changed && !point_changed && !size_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5555 && !toolbar_changed && !windows_changed && !windows_structure_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5556 && !disable_preemption && preemption_count < max_preempts)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5557 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5558
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5559 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5560 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5561 struct device *d = XDEVICE (XCAR (devcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5562 int preempted;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5564 if (d->buffers_changed || d->clip_changed || d->extents_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5565 || d->faces_changed || d->frame_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5566 || d->icon_changed || d->menubar_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5567 || d->modeline_changed || d->point_changed || d->size_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5568 || d->toolbar_changed || d->windows_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5569 || d->windows_structure_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5570 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5571 preempted = redisplay_device (d);
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 (preempted)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5574 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5575 preemption_count++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5576 RESET_CHANGED_SET_FLAGS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5577 goto done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5578 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5579
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5580 /* See comment in redisplay_device. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5581 if (d->size_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5582 size_change_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5583 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5584 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5585 preemption_count = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5586
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5587 /* Mark redisplay as accurate */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5588 buffers_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5589 clip_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5590 extents_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5591 frame_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5592 icon_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5593 menubar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5594 modeline_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5595 point_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5596 toolbar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5597 windows_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5598 windows_structure_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5599 RESET_CHANGED_SET_FLAGS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5601 if (faces_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5602 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5603 mark_all_faces_as_clean ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5604 faces_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5605 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5607 if (!size_change_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5608 size_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5610 reset_buffer_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5612 done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5613 unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5614 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5616 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5617 redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5618 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5619 if (last_display_warning_tick != display_warning_tick &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5620 !inhibit_warning_display)
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 an error occurs during this function, oh well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5623 If we report another warning, we could get stuck in an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5624 infinite loop reporting warnings. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5625 call0_trapping_errors (0, Qdisplay_warning_buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5626 last_display_warning_tick = display_warning_tick;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5627 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5628 /* The run_hook_trapping_errors functions are smart enough not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5629 to do any evalling if the hook function is empty, so there
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5630 should not be any significant time loss. All places in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5631 C code that call redisplay() are prepared to handle GCing,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5632 so we should be OK. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5633 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5634 run_hook_trapping_errors ("Error in pre-redisplay-hook",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5635 Qpre_redisplay_hook);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5636 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5637
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5638 redisplay_without_hooks ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5639
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5640 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5641 run_hook_trapping_errors ("Error in post-redisplay-hook",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5642 Qpost_redisplay_hook);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5643 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5644 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5645
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5646 /* Inefficiently determine the line number of the line point is on and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5647 return it as a string. Always do this regardless of whether
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5648 line_number_mode is true. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5649
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5650 static char window_line_number_buf[100];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5651 static char *
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5652 window_line_number (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5653 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5654 struct device *d = XDEVICE (XFRAME (w->frame)->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5655 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5656 Bufpos end =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5657 ((w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5658 ? BUF_PT (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5659 : marker_position (w->pointm[type]));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5660 int lots = 999999999;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5661 int shortage, line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5662
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5663 scan_buffer (b, '\n', end, 0, -lots, &shortage, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5664 line = lots - shortage + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5665
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5666 sprintf (window_line_number_buf, "%d", line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5667
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5668 return (window_line_number_buf);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5669 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5670
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5671 /* Given a character representing an object in a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5672 specification, return a string (stored into the global array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5673 `mode_spec_bufbyte_string') with the information that object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5674 represents.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5675
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5676 This function is largely unchanged from previous versions of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5677 redisplay engine. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5678
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5679 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5680 decode_mode_spec (struct window *w, Emchar spec, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5681 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5682 Lisp_Object obj = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5683 CONST char *str = NULL;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5684 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5685
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5686 Dynarr_reset (mode_spec_bufbyte_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5687
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5688 switch (spec)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5689 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5690 /* print buffer name */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5691 case 'b':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5692 obj = b->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5693 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5694
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5695 /* print visited file name */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5696 case 'f':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5697 obj = b->filename;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5698 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5699
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5700 /* print the current column */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5701 case 'c':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5702 {
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
5703 int col = current_column (b) + (column_number_start_at_one != 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5704 int temp = col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5705 int size = 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5706 char *buf;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5707
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5708 while (temp >= 10)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5709 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5710 temp /= 10;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5711 size++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5712 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5713
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5714 buf = (char *) alloca (size * sizeof (char));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5715 sprintf (buf, "%d", col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5716
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5717 Dynarr_add_many (mode_spec_bufbyte_string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5718 (CONST Bufbyte *) buf, strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5719
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5720 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5721 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5722
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5723 /* print the current line number */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5724 case 'l':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5725 str = window_line_number (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5726 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5727
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5728 /* print value of mode-name (obsolete) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5729 case 'm':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5730 obj = b->mode_name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5731 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5732
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5733 /* print Narrow if appropriate */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5734 case 'n':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5735 if (BUF_BEGV (b) > BUF_BEG (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5736 || BUF_ZV (b) < BUF_Z (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5737 str = " Narrow";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5738 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5739
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5740 /* print %, * or hyphen, if buffer is read-only, modified or neither */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5741 case '*':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5742 str = (!NILP (b->read_only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5743 ? "%"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5744 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5745 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5746 : "-"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5747 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5748
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5749 /* print * or hyphen -- XEmacs change to allow a buffer to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5750 read-only but still indicate whether it is modified. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5751 case '+':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5752 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5753 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5754 : (!NILP (b->read_only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5755 ? "%"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5756 : "-"));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5757 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5759 /* #### defined in 19.29 decode_mode_spec, but not in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5760 modeline-format doc string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5761 /* This differs from %* in that it ignores read-only-ness. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5762 case '&':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5763 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5764 ? "*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5765 : "-");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5766 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5767
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5768 /* print process status */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5769 case 's':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5770 obj = Fget_buffer_process (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5771 if (NILP (obj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5772 str = GETTEXT ("no process");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5773 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5774 obj = Fsymbol_name (Fprocess_status (obj));
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 name of selected frame (only meaningful under X Windows) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5778 case 'S':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5779 obj = XFRAME (w->frame)->name;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5780 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5782 /* indicate TEXT or BINARY */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5783 case 't':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5784 #ifdef MSDOS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5785 str = NILP (b->buffer_file_type) ? "T" : "B";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5786 #else /* not MSDOS */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5787 str = "T";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5788 #endif /* not MSDOS */
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5789 break;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5790
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5791 /* print percent of buffer above top of window, or Top, Bot or All */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5792 case 'p':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5793 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5794 Bufpos pos = marker_position (w->start[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5795 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5797 /* This had better be while the desired lines are being done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5798 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5799 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5800 if (pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5801 str = "All";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5802 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5803 str = "Bottom";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5804 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5805 else if (pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5806 str = "Top";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5807 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5808 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5809 /* This hard limit is ok since the string it will hold has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5810 fixed maximum length of 3. But just to be safe... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5811 char buf[10];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5813 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5814
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5815 /* We can't normally display a 3-digit number, so get us a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5816 2-digit number that is close. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5817 if (total == 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5818 total = 99;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5819
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5820 sprintf (buf, "%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5821 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5822 strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5823
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5824 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5825 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5826 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5827 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5828
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5829 /* print percent of buffer above bottom of window, perhaps plus
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5830 Top, or print Bottom or All */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5831 case 'P':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5832 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5833 Bufpos toppos = marker_position (w->start[type]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5834 Bufpos botpos = BUF_Z (b) - w->window_end_pos[type];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5835 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5836
10
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5837 /* botpos is only accurate as of the last redisplay, so we can
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5838 only treat it as a hint. In particular, after erase-buffer,
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5839 botpos may be negative. */
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5840 if (botpos < toppos)
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5841 botpos = toppos;
49a24b4fd526 Import from CVS: tag r19-15b6
cvs
parents: 4
diff changeset
5842
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5843 if (botpos >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5844 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5845 if (toppos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5846 str = "All";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5847 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5848 str = "Bottom";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5849 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5850 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5851 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5852 /* This hard limit is ok since the string it will hold has a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5853 fixed maximum length of around 6. But just to be safe... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5854 char buf[10];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5855
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5856 total = ((botpos - BUF_BEGV (b)) * 100 + total - 1) / total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5858 /* We can't normally display a 3-digit number, so get us a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5859 2-digit number that is close. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5860 if (total == 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5861 total = 99;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5862
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5863 if (toppos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5864 sprintf (buf, "Top%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5865 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5866 sprintf (buf, "%2d%%", total);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5867
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5868 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) buf,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5869 strlen (buf));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5870
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5871 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5872 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5873 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5874 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5875
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5876 /* print % */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5877 case '%':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5878 str = "%";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5879 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5880
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5881 /* print one [ for each recursive editing level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5882 case '[':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5883 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5884 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5885
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5886 if (command_loop_level > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5887 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5888 str = "[[[... ";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5889 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5890 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5891
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5892 for (i = 0; i < command_loop_level; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5893 Dynarr_add (mode_spec_bufbyte_string, '[');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5894
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5895 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5896 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5898 /* print one ] for each recursive editing level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5899 case ']':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5900 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5901 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5902
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5903 if (command_loop_level > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5904 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5905 str = "...]]]";
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5906 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5907 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5908
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5909 for (i = 0; i < command_loop_level; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5910 Dynarr_add (mode_spec_bufbyte_string, ']');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5911
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5912 goto decode_mode_spec_done;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5913 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5914
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5915 /* print infinitely many dashes -- handle at top level now */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5916 case '-':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5917 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5918
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5919 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5920
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5921 if (STRINGP (obj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5922 Dynarr_add_many (mode_spec_bufbyte_string, string_data (XSTRING (obj)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5923 string_length (XSTRING (obj)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5924 else if (str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5925 Dynarr_add_many (mode_spec_bufbyte_string, (Bufbyte *) str, strlen (str));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5926
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5927 decode_mode_spec_done:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5928 Dynarr_add (mode_spec_bufbyte_string, '\0');
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5929 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5930
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5931 /* Given a display line, free all if its data structures. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5932
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5933 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5934 free_display_line (struct display_line *dl)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5935 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5936 int block;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5937
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5938 if (dl->display_blocks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5939 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5940 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5941 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5942 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5943
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5944 Dynarr_free (db->runes);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5945 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5946
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5947 Dynarr_free (dl->display_blocks);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5948 dl->display_blocks = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5949 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5950
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5951 if (dl->left_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5952 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5953 Dynarr_free (dl->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5954 dl->left_glyphs = 0;
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 if (dl->right_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5958 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5959 Dynarr_free (dl->right_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5960 dl->right_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5961 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5962 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5964
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5965 /* Given an array of display lines, free them and all data structures
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5966 contained within them. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5967
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5968 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5969 free_display_lines (display_line_dynarr *dla)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5970 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5971 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5972
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5973 for (line = 0; line < Dynarr_largest (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5974 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5975 free_display_line (Dynarr_atp (dla, line));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5976 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5977
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5978 Dynarr_free (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5979 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5980
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5981 /* Call internal free routine for each set of display lines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5982
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5983 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5984 free_display_structs (struct window_mirror *mir)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5985 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5986 if (mir->current_display_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5987 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5988 free_display_lines (mir->current_display_lines);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5989 mir->current_display_lines = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5990 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5992 if (mir->desired_display_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5993 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5994 free_display_lines (mir->desired_display_lines);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5995 mir->desired_display_lines = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5996 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5997 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5998
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6000 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6001 mark_redisplay_structs (display_line_dynarr *dla,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6002 void (*markobj) (Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6003 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6004 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6005
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6006 for (line = 0; line < Dynarr_length (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6007 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6008 int block, loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6009 struct display_line *dl = Dynarr_atp (dla, 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 (block = 0; block < Dynarr_length (dl->display_blocks); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6012 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6013 int rune;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6014 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6015
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6016 for (rune = 0; rune < Dynarr_length (db->runes); rune++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6017 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6018 struct rune *rb = Dynarr_atp (db->runes, rune);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6020 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6021 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6022 if (!NILP (rb->object.dglyph.glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6023 ((markobj) (rb->object.dglyph.glyph));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6024 if (!NILP (rb->object.dglyph.extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6025 ((markobj) (rb->object.dglyph.extent));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6026 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6027 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6028 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6029
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6030 for (loop = 0; loop < 2; loop++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6031 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6032 glyph_block_dynarr *gba = (loop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6033 ? dl->right_glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6034 : dl->left_glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6035
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6036 if (gba != NULL)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6037 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6038 for (block = 0; block < Dynarr_length (gba); block++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6039 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6040 struct glyph_block *gb = Dynarr_atp (gba, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6042 if (!NILP (gb->glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6043 ((markobj) (gb->glyph));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6044 if (!NILP (gb->extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6045 ((markobj) (gb->extent));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6046 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6047 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6048 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6049 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6050 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6051
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6052 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6053 mark_window_mirror (struct window_mirror *mir, void (*markobj)(Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6054 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6055 mark_redisplay_structs (mir->current_display_lines, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6056 mark_redisplay_structs (mir->desired_display_lines, markobj);
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 (mir->next)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6059 mark_window_mirror (mir->next, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6060
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6061 if (mir->hchild)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6062 mark_window_mirror (mir->hchild, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6063 else if (mir->vchild)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6064 mark_window_mirror (mir->vchild, markobj);
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 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6068 mark_redisplay (void (*markobj)(Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6069 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6070 Lisp_Object frmcons, devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6072 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6073 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6074 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6075 update_frame_window_mirror (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6076 mark_window_mirror (f->root_mirror, markobj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6077 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6078 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6079
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6080 /*****************************************************************************
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6081 Line Start Cache Description and Rationale
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6082
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6083 The traditional scrolling code in Emacs breaks in a variable height world.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6084 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
6085 displayed at any given time is fixed. This led to a complete separation
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6086 of the scrolling code from the redisplay code. In order to fully support
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6087 variable height lines, the scrolling code must actually be tightly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6088 integrated with redisplay. Only redisplay can determine how many lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6089 will be displayed on a screen for any given starting point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6090
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6091 What is ideally wanted is a complete list of the starting buffer position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6092 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
6093 display line. Maintaining such a full list would be very expensive. We
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6094 settle for having it include information for all areas which we happen to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6095 generate anyhow (i.e. the region currently being displayed) and for those
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6096 areas we need to work with.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6097
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6098 In order to ensure that the cache accurately represents what redisplay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6099 would actually show, it is necessary to invalidate it in many situations.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6100 If the buffer changes, the starting positions may no longer be correct.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6101 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
6102 These events happen frequently enough that the cache can end up being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6103 constantly disabled. With this potentially constant invalidation when is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6104 the cache ever useful?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6106 Even if the cache is invalidated before every single usage, it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6107 necessary. Scrolling often requires knowledge about display lines which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6108 are actually above or below the visible region. The cache provides a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6109 convenient light-weight method of storing this information for multiple
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6110 display regions. This knowledge is necessary for the scrolling code to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6111 always obey the First Golden Rule of Redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6112
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6113 If the cache already contains all of the information that the scrolling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6114 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
6115 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
6116 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
6117 region had to be generated anyway, so the cache ends up getting the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6118 information basically for free. In those cases where a user is simply
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6119 scrolling around viewing a buffer there is a high probability that this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6120 sufficient to always provide the needed information. The second thing we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6121 can do is be smart about invalidating the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6122
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6123 TODO -- Be smart about invalidating the cache. Potential places:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6125 + 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
6126 starting positions of any display lines. These types of buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6127 modifications should not invalidate the cache. This is actually a large
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6128 optimization for redisplay speed as well.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6130 + Buffer modifications frequently only affect the display of lines at and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6131 below where they occur. In these situations we should only invalidate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6132 the part of the cache starting at where the modification occurs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6133
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6134 In case you're wondering, the Second Golden Rule of Redisplay is not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6135 applicable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6136 ****************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6137
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6138 /* 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
6139 allocating and freeing it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6140 line_start_cache_dynarr *internal_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6141
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6142 /* Makes internal_cache represent the TYPE display structs and only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6143 the TYPE display structs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6144
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6145 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6146 update_internal_cache_list (struct window *w, int type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6147 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6148 int line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6149 display_line_dynarr *dla = window_display_lines (w, type);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6151 Dynarr_reset (internal_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6152 for (line = 0; line < Dynarr_length (dla); line++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6153 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6154 struct display_line *dl = Dynarr_atp (dla, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6156 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6157 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6158 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6159 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6160 struct line_start_cache lsc;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6162 lsc.start = dl->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6163 lsc.end = dl->end_bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6164 lsc.height = dl->ascent + dl->descent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6166 Dynarr_add (internal_cache, lsc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6167 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6168 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6169 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6170
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6171 /* Reset the line cache if necessary. This should be run at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6172 beginning of any function which access the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6174 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6175 validate_line_start_cache (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6176 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6177 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6178 struct frame *f = XFRAME (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6180 if (!w->line_cache_validation_override)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6181 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6182 /* f->extents_changed used to be in here because extent face and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6183 size changes can cause text shifting. However, the extent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6184 covering the region is constantly having its face set and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6185 priority altered by the mouse code. This means that the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6186 start cache is constanty being invalidated. This is bad
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6187 since the mouse code also triggers heavy usage of the cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6188 Since it is an unlikely that f->extents being changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6189 indicates that the cache really needs to be updated and if it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6190 does redisplay will catch it pretty quickly we no longer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6191 invalidate the cache if it is set. This greatly speeds up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6192 dragging out regions with the mouse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6193 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6194 || f->faces_changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6195 || f->clip_changed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6196 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6197 Dynarr_reset (w->line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6198 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6199 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6200 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6201
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6202 /* Return the very first buffer position contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6203 window's cache, or -1 if the cache is empty. Assumes that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6204 cache is valid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6205
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6206 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6207 line_start_cache_start (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6208 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6209 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6210
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6211 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6212 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6213 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6214 return (Dynarr_atp (cache, 0)->start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6215 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6216
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6217 /* Return the very last buffer position contained in the given
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6218 window's cache, or -1 if the cache is empty. Assumes that the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6219 cache is valid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6221 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6222 line_start_cache_end (struct window *w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6223 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6224 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6225
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6226 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6227 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6228 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6229 return (Dynarr_atp (cache, Dynarr_length (cache) - 1)->end);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6230 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6232 /* Return the index of the line POINT is contained within in window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6233 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
6234 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
6235 a guarantee of the number of entries in the cache present on either
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6236 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
6237 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
6238 allowed to shift. Returns -1 if POINT cannot be found in the cache
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6239 for any reason. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6240
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6241 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6242 point_in_line_start_cache (struct window *w, Bufpos point, int min_past)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6243 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6244 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6245 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6246 unsigned int top, bottom, pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6248 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6249 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6251 /* Let functions pass in negative values, but we still treat -1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6252 specially. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6253 /* #### bogosity alert */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6254 if (min_past < 0 && min_past != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6255 min_past = -min_past;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6256
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6257 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6258 || line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6259 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6260 int loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6261 int win_char_height = window_char_height (w, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6263 /* Occasionally we get here with a 0 height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6264 window. find_next_newline_no_quit will abort if we pass it a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6265 count of 0 so handle that case. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6266 if (!win_char_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6267 win_char_height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6268
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6269 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6270 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6271 Bufpos from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6272 Bufpos to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6273
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6274 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6275
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6276 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6277 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6278 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6279 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6280 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6281 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6282
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6283 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6284
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6285 loop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6286 while (line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6287 && (loop < cache_adjustment || min_past == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6288 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6289 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6291 from = line_start_cache_start (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6292 if (from <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6293 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6295 from = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6296 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6297
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6298 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6299 loop++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6300 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6301
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6302 if (line_start_cache_start (w) > point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6303 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6304 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6305
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6306 from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6307 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6308 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6309 to = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6310 from = to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6311 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6312 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6313 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6314 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6315
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6316 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6317 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6319 loop = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6320 while (line_start_cache_end (w) < point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6321 && (loop < cache_adjustment || min_past == -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6322 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6323 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6324
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6325 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6326 if (to >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6327 break;
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_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6330 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6331
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6332 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6333 loop++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6334 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6335
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6336 if (line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6337 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6338 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6339
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6340 from = find_next_newline_no_quit (b, point, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6341 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6342 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6343 to = find_next_newline_no_quit (b, from, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6344 from = to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6345 to = 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 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6348 to = find_next_newline_no_quit (b, from, win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6350 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6351 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6352 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6354 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6355
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6356 if (min_past == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6357 min_past = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6358
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6359 /* This could happen if the buffer is narrowed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6360 if (line_start_cache_start (w) > point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6361 || line_start_cache_end (w) < point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6362 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6363 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6364 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6365 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6367 find_point_loop:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6368
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6369 top = Dynarr_length (cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6370 bottom = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6371
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6372 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6373 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6374 unsigned int new_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6375 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6376
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6377 pos = (bottom + top + 1) >> 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6378 start = Dynarr_atp (cache, pos)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6379 end = Dynarr_atp (cache, pos)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6380
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6381 if (point >= start && point <= end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6382 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6383 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (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 Bufpos from =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6386 find_next_newline_no_quit (b, line_start_cache_start (w),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6387 -min_past - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6388 Bufpos to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6390 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6391 goto find_point_loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6392 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6393 else if ((Dynarr_length (cache) - pos - 1) < min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6394 && line_start_cache_end (w) < BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6395 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6396 Bufpos from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6397 Bufpos to = find_next_newline_no_quit (b, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6398 (min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6399 ? min_past
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6400 : 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6401
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6402 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6403 goto find_point_loop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6404 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6405 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6406 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6407 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6408 return pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6409 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6410 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6411 else if (point > end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6412 bottom = pos + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6413 else if (point < start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6414 top = pos - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6415 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6416 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6417
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6418 new_pos = (bottom + top + 1) >> 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6419 if (pos == new_pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6420 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6421 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6422 return -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6423 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6424 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6425 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6427 /* Return a boolean indicating if POINT would be visible in window W
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6428 if display of the window was to begin at STARTP. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6430 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6431 point_would_be_visible (struct window *w, Bufpos startp, Bufpos point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6432 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6433 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6434 int pixpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6435 int bottom = WINDOW_TEXT_HEIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6436 int start_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6437
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6438 /* If point is before the intended start it obviously can't be visible. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6439 if (point < startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6440 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6441
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6442 /* If point or start are not in the accessible buffer range, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6443 fail. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6444 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6445 || point < BUF_BEGV (b) || point > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6446 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6447 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6448 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6449 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6451 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6452 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6453
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6454 start_elt = point_in_line_start_cache (w, startp, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6455 if (start_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6456 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6457 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6458 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6459 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6461 assert (line_start_cache_start (w) <= startp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6462 && line_start_cache_end (w) >= startp);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6463
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6464 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6465 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6466 int height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6468 /* Expand the cache if necessary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6469 if (start_elt == Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6470 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6471 Bufpos old_startp =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6472 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6474 start_elt = point_in_line_start_cache (w, old_startp,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6475 window_char_height (w, 0));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6476
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6477 /* We've already actually processed old_startp, so increment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6478 immediately. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6479 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6480
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6481 /* If this happens we didn't add any extra elements. Bummer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6482 if (start_elt == Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6483 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6484 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6485 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6486 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6487 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6488
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6489 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6490
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6491 if (pixpos + height > bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6492 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6493 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6500 pixpos += height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6501 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6502 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6503 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6504 return 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6505 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6506
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6507 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6508 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6509 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6510
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6511 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6512 the buffer position at the beginning or end of the last line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6513 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
6514 position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6516 #### With a little work this could probably be reworked as just a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6517 call to start_with_line_at_pixpos. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6519 static Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6520 start_end_of_last_line (struct window *w, Bufpos startp, int end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6521 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6522 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6523 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6524 int pixpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6525 int bottom = WINDOW_TEXT_HEIGHT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6526 Bufpos cur_start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6527 int start_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6528
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6529 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6530 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6531
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6532 if (startp < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6533 startp = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6534 else if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6535 startp = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6536 cur_start = startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6538 start_elt = point_in_line_start_cache (w, cur_start, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6539 if (start_elt == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6540 abort (); /* this had better never happen */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6542 while (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 int height = Dynarr_atp (cache, start_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6546 cur_start = Dynarr_atp (cache, start_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6547
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6548 if (pixpos + height > bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6549 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6550 /* Adjust for any possible clip. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6551 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6552 start_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6554 if (start_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6555 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6556 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6557 if (end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6558 return (BUF_ZV (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6559 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6560 return (BUF_BEGV (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6561 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6562 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6563 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6564 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6565 if (end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6566 return Dynarr_atp (cache, start_elt)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6567 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6568 return Dynarr_atp (cache, start_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6569 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6570 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6571
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6572 pixpos += height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6573 start_elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6574 if (start_elt == Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6575 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6576 Bufpos from = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6577 int win_char_height = window_char_height (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6578 Bufpos to = find_next_newline_no_quit (b, from,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6579 (win_char_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6580 ? win_char_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6581 : 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6582
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6583 /* 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
6584 if (from >= BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6585 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6586 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6587 return (BUF_ZV (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6588 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6589
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6590 update_line_start_cache (w, from, to, BUF_PT (b), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6591
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6592 /* Updating the cache invalidates any current indexes. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6593 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6594 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6595 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6596 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6597
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6598 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6599 the buffer position at the beginning of the last line displayed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6601 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6602 start_of_last_line (struct window *w, Bufpos startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6603 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6604 return start_end_of_last_line (w, startp, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6605 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6607 /* For the given window W, if display starts at STARTP, what will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6608 the buffer position at the end of the last line displayed. This is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6609 also know as the window end position. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6611 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6612 end_of_last_line (struct window *w, Bufpos startp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6613 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6614 return start_end_of_last_line (w, startp, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6615 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6617 /* For window W, what does the starting position have to be so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6618 the line containing POINT will cover pixel position PIXPOS. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6619
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6620 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6621 start_with_line_at_pixpos (struct window *w, Bufpos point, int pixpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6622 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6623 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6624 int cur_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6625 Bufpos cur_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6626 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6627
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6628 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6629 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6630
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6631 cur_elt = point_in_line_start_cache (w, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6632 /* #### See comment in update_line_start_cache about big minibuffers. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6633 if (cur_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6634 return point;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6635 while (1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6636 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6637 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6639 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6640
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6641 /* Do not take into account the value of vertical_clip here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6642 That is the responsibility of the calling functions. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6643 if (pixheight < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6644 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6645 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6646 return cur_pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6647 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6648
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6649 cur_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6650 if (cur_elt < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6651 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6652 Bufpos from, to;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6653 int win_char_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6654
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6655 if (cur_pos <= BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6656 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6657 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6658 return (BUF_BEGV (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6659 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6660
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6661 win_char_height = window_char_height (w, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6662 if (!win_char_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6663 win_char_height = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6664
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6665 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6666 to = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6667 update_line_start_cache (w, from, to, point, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6668
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6669 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6670 assert (cur_elt >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6671 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6672 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6673 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6674
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6675 /* For window W, what does the starting position have to be so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6676 the line containing point is on display line LINE. If LINE is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6677 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
6678 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
6679 considered to be the number of lines from the bottom (-1 is the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6680 bottom line). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6681
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6682 Bufpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6683 start_with_point_on_display_line (struct window *w, Bufpos point, int line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6684 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6685 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6686 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6687
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6688 if (line >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6689 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6690 int cur_elt = point_in_line_start_cache (w, point, line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6691
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6692 if (cur_elt - line < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6693 cur_elt = 0; /* Hit the top */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6694 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6695 cur_elt -= line;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6696
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6697 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6698 return (Dynarr_atp (w->line_start_cache, cur_elt)->start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6699 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6700 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6701 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6702 /* The calculated value of pixpos is correct for the bottom line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6703 or what we want when line is -1. Therefore we subtract one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6704 because we have already handled one line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6705 int new_line = -line - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6706 int cur_elt = point_in_line_start_cache (w, point, new_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6707 int pixpos = WINDOW_TEXT_BOTTOM (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6708 Bufpos retval, search_point;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6709
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6710 /* If scroll_on_clipped_lines is false, the last "visible" line of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6711 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6712 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
6713 line, so back up from the bottom by the height of the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6714 containing point. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6715 if (scroll_on_clipped_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6716 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6717 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6718 pixpos -= 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6719
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6720 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6721 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6722 /* Hit the bottom of the buffer. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6723 int adjustment =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6724 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6725 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6726 int defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6727
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6728 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6729 default_face_height_and_width (window, &defheight, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6730
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6731 cur_elt = Dynarr_length (w->line_start_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6732
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6733 pixpos -= (adjustment * defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6734 if (pixpos < WINDOW_TEXT_TOP (w))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6735 pixpos = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6736 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6737 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6738 cur_elt = cur_elt + new_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 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6742 retval = start_with_line_at_pixpos (w, search_point, pixpos);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6743 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6744 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6745 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6746 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6748 /* This is used to speed up vertical scrolling by caching the known
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6749 buffer starting positions for display lines. This allows the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6750 scrolling routines to avoid costly calls to regenerate_window. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6751 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
6752 display structs which are in the given range.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6753
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6754 Note also that the FROM/TO values are minimums. It is possible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6755 that this function will actually add information outside of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6756 lines containing those positions. This can't hurt but it could
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6757 possibly help.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6758
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6759 #### We currently force the cache to have only 1 contiguous region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6760 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
6761 cover more areas. This might, however, turn out to be a lot of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6762 overhead for too little gain. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6764 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6765 update_line_start_cache (struct window *w, Bufpos from, Bufpos to,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6766 Bufpos point, int no_regen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6767 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6768 struct buffer *b = XBUFFER (w->buffer);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6769 line_start_cache_dynarr *cache = w->line_start_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6770 Bufpos low_bound, high_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6771
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6772 validate_line_start_cache (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6773 w->line_cache_validation_override++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6774 updating_line_start_cache = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6776 if (from < BUF_BEGV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6777 from = BUF_BEGV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6778 if (to > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6779 to = BUF_ZV (b);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6780
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6781 if (from > to)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6782 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6783 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6784 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6785 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6786 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6788 if (Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6789 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6790 low_bound = line_start_cache_start (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6791 high_bound = line_start_cache_end (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6792
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6793 /* Check to see if the desired range is already in the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6794 if (from >= low_bound && to <= high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6795 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6796 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6797 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6798 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6799 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6800
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6801 /* Check to make sure that the desired range is adjacent to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6802 current cache. If not, invalidate the cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6803 if (to < low_bound || from > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6804 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6805 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6806 low_bound = high_bound = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6807 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6808 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6809 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6810 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6811 low_bound = high_bound = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6812 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6814 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6815
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6816 /* This could be integrated into the next two sections, but it is easier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6817 to follow what's going on by having it separate. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6818 if (no_regen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6819 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6820 Bufpos start, end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6821
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6822 update_internal_cache_list (w, DESIRED_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6823 if (!Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6824 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6825 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6826 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6827 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6828 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6830 start = Dynarr_atp (internal_cache, 0)->start;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6831 end =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6832 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6834 /* We aren't allowed to generate additional information to fill in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6835 gaps, so if the DESIRED structs don't overlap the cache, reset the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6836 cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6837 if (Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6838 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6839 if (end < low_bound || start > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6840 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6841
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6842 /* #### What should really happen if what we are doing is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6843 extending a line (the last line)? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6844 if (Dynarr_length (cache) == 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6845 && Dynarr_length (internal_cache) == 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6846 Dynarr_reset (cache);
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 if (!Dynarr_length (cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6850 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6851 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6852 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6853 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6854 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6855 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6856 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6857
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6858 /* An extra check just in case the calling function didn't pass in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6859 the bounds of the DESIRED structs in the first place. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6860 if (start >= low_bound && end <= high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6861 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6862 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6863 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6864 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6865 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6867 /* At this point we know that the internal cache partially overlaps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6868 the main cache. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6869 if (start < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6870 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6871 int ic_elt = Dynarr_length (internal_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6872 while (ic_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6873 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6874 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6875 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6876 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6877 ic_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6878 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6879
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6880 if (!(ic_elt >= 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6881 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6882 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6883 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6884 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6885 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6886 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6887 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6888 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6889
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6890 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6891 ic_elt + 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6892 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6893
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6894 if (end > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6895 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6896 int ic_elt = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6897
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6898 while (ic_elt < Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6899 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6900 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6901 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6902 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6903 ic_elt++;
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 if (!(ic_elt < Dynarr_length (internal_cache)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6907 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6908 Dynarr_reset (cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6909 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6910 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6911 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6912 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6913 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6914 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6915
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6916 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6917 Dynarr_length (internal_cache) - ic_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6918 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6919
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6920 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6921 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6922 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6923 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6924
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6925 if (!Dynarr_length (cache) || from < low_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6926 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6927 Bufpos startp = find_next_newline_no_quit (b, from, -1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6928 int marker = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6929 int old_lb = low_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6930
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6931 while (startp < old_lb || low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6932 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6933 int ic_elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6934
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6935 regenerate_window (w, startp, point, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6936 update_internal_cache_list (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6937
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6938 /* If this assert is triggered then regenerate_window failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6939 to layout a single line. That is not supposed to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6940 possible because we impose a minimum height on the buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6941 and override vertical clip when we are in here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6942 /* #### Ah, but it is because the window may temporarily
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6943 exist but not have any lines at all if the minibuffer is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6944 real big. Look into that situation better. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6945 if (!Dynarr_length (internal_cache))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6946 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6947 if (old_lb == -1 && low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6948 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6949 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6950 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6951 return;
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 assert (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 assert (startp == Dynarr_atp (internal_cache, 0)->start);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6957
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6958 ic_elt = Dynarr_length (internal_cache) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6959 if (low_bound != -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6960 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6961 while (ic_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6962 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6963 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6964 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6965 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6966 ic_elt--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6967 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6968 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6969 assert (ic_elt >= 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6970
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6971 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6972 ic_elt + 1, marker);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6973 marker += (ic_elt + 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6975 if (startp < low_bound || low_bound == -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6976 low_bound = startp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6977 startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6978 if (startp > BUF_ZV (b))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6979 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6980 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6981 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6982 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6983 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6984 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6985 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6987 assert (Dynarr_length (cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6988 assert (from >= low_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6990 /* Readjust the high_bound to account for any changes made while
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6991 correcting the low_bound. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6992 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6993
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6994 if (to > high_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6995 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6996 Bufpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6997
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6998 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6999 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7000 regenerate_window (w, startp, point, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7001 update_internal_cache_list (w, CMOTION_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7002
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7003 /* See comment above about regenerate_window failing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7004 assert (Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7005
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7006 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7007 Dynarr_length (internal_cache));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7008 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7009 startp = high_bound + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7010 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7011 while (to > high_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7012 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7013
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7014 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7015 w->line_cache_validation_override--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7016 assert (to <= high_bound);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7017 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7018
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7020 /* Given x and y coordinates in characters, relative to a window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7021 return the pixel location corresponding to those coordinates. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7022 pixel location returned is the center of the given character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7023 position. The pixel values are generated relative to the window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7024 not the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7025
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7026 The modeline is considered to be part of the window. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7027
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7028 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7029 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7030 int *pix_x, int *pix_y)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7031 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7032 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7033 int num_disp_lines, modeline;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7034 Lisp_Object window = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7035 int defheight, defwidth;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7037 XSETWINDOW (window, w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7038 default_face_height_and_width (window, &defheight, &defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7039
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7040 /* If we get a bogus value indicating somewhere above or to the left of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7041 the window, use the first window line or character position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7042 instead. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7043 if (char_y < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7044 char_y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7045 if (char_x < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7046 char_x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7047
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7048 num_disp_lines = Dynarr_length (dla);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7049 modeline = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7050 if (num_disp_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7051 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7052 if (Dynarr_atp (dla, 0)->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7053 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7054 num_disp_lines--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7055 modeline = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7056 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7057 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7058
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7059 /* First check if the y position intersects the display lines. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7060 if (char_y < num_disp_lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7061 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7062 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7063 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7064
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7065 *pix_y = (dl->ypos - dl->ascent +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7066 ((unsigned int) (dl->ascent + dl->descent - dl->clip) >> 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7067
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7068 if (char_x < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7069 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7070 struct rune *rb = Dynarr_atp (db->runes, char_x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7072 *pix_x = rb->xpos + (rb->width >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7073 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7074 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7075 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7076 int last_rune = Dynarr_length (db->runes) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7077 struct rune *rb = Dynarr_atp (db->runes, last_rune);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7078
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7079 char_x -= last_rune;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7080
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7081 *pix_x = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7082 *pix_x += ((char_x - 1) * defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7083 *pix_x += (defwidth >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7084 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7085 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7086 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7087 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7088 /* It didn't intersect, so extrapolate. #### For now, we include the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7089 modeline in this since we don't have true character positions in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7090 it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7091
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7092 if (!Dynarr_length (w->face_cachels))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7093 reset_face_cachels (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7094
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7095 char_y -= num_disp_lines;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7096
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7097 if (Dynarr_length (dla))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7098 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7099 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7100 *pix_y = dl->ypos + dl->descent - dl->clip;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7101 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7102 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7103 *pix_y = WINDOW_TEXT_TOP (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7104
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7105 *pix_y += (char_y * defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7106 *pix_y += (defheight >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7107
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7108 *pix_x = WINDOW_TEXT_LEFT (w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7109 /* Don't adjust by one because this is still the unadjusted value. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7110 *pix_x += (char_x * defwidth);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7111 *pix_x += (defwidth >> 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7112 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7113
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7114 if (*pix_x > w->pixel_left + w->pixel_width)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7115 *pix_x = w->pixel_left + w->pixel_width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7116 if (*pix_y > w->pixel_top + w->pixel_height)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7117 *pix_y = w->pixel_top + w->pixel_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7118
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7119 *pix_x -= w->pixel_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7120 *pix_y -= w->pixel_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7121 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7122
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7123 /* Given a display line and a position, determine if there is a glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7124 there and return information about it if there is. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7126 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7127 get_position_object (struct display_line *dl, Lisp_Object *obj1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7128 Lisp_Object *obj2, int x_coord, int *low_x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7129 int *high_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7130 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7131 struct display_block *db;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7132 int elt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7133 int block =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7134 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7136 /* We use get_next_display_block to get the actual display block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7137 that would be displayed at x_coord. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7139 if (block == NO_BLOCK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7140 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7141 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7142 db = Dynarr_atp (dl->display_blocks, block);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7143
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7144 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7145 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7146 struct rune *rb = Dynarr_atp (db->runes, elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7147
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7148 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7149 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7150 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7151 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7152 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7153 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7154 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7155 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7156 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7157 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7158 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7159 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7160
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7161 if (low_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7162 *low_x_coord = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7163 if (high_x_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7164 *high_x_coord = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7166 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7167 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7168 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7169 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7170
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7171 #define UPDATE_CACHE_RETURN \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7172 do { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7173 d->pixel_to_glyph_cache.valid = 1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7174 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7175 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7176 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7177 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7178 d->pixel_to_glyph_cache.frame = f; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7179 d->pixel_to_glyph_cache.col = *col; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7180 d->pixel_to_glyph_cache.row = *row; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7181 d->pixel_to_glyph_cache.obj_x = *obj_x; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7182 d->pixel_to_glyph_cache.obj_y = *obj_y; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7183 d->pixel_to_glyph_cache.w = *w; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7184 d->pixel_to_glyph_cache.bufpos = *bufpos; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7185 d->pixel_to_glyph_cache.closest = *closest; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7186 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7187 d->pixel_to_glyph_cache.obj1 = *obj1; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7188 d->pixel_to_glyph_cache.obj2 = *obj2; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7189 d->pixel_to_glyph_cache.retval = position; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7190 RETURN__ position; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7191 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7192
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7193 /* Given x and y coordinates in pixels relative to a frame, return
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7194 information about what is located under those coordinates.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7196 The return value will be one of:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7197
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7198 OVER_TOOLBAR: over one of the 4 frame toolbars
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7199 OVER_MODELINE: over a modeline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7200 OVER_BORDER: over an internal border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7201 OVER_NOTHING: over the text area, but not over text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7202 OVER_OUTSIDE: outside of the frame border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7203 OVER_TEXT: over text in the text area
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 is one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7206
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7207 -- a toolbar button
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7208 -- a glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7209 -- nil if the coordinates are not over a glyph or a toolbar button.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7210
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7211 OBJ2 is one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7212
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7213 -- an extent, if the coordinates are over a glyph in the text area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7214 -- nil otherwise.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7216 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
7217 equivalent coordinates relative to the upper-left corner of the glyph.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7219 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
7220 equivalent coordinates relative to the upper-left corner of the character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7221
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7222 Otherwise, OBJ_X and OBJ_Y are undefined.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7223 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7224
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7225 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7226 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7227 int *col, int *row, int *obj_x, int *obj_y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7228 struct window **w, Bufpos *bufpos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7229 Bufpos *closest, Charcount *modeline_closest,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7230 Lisp_Object *obj1, Lisp_Object *obj2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7231 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7232 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7233 struct pixel_to_glyph_translation_cache *cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7234 Lisp_Object window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7235 int frm_left, frm_right, frm_top, frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7236 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7237 int position = OVER_NOTHING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7238 int device_check_failed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7239 display_line_dynarr *dla;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7240
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7241 /* 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
7242 the middle of being deleted. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7243 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7244 device_check_failed = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7245 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7246 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7247 d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7248 cache = &d->pixel_to_glyph_cache;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7249 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7250
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7251 if (!device_check_failed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7252 && cache->valid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7253 && cache->frame == f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7254 && cache->low_x_coord <= x_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7255 && cache->high_x_coord > x_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7256 && cache->low_y_coord <= y_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7257 && cache->high_y_coord > y_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7258 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7259 *col = cache->col;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7260 *row = cache->row;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7261 *obj_x = cache->obj_x;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7262 *obj_y = cache->obj_y;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7263 *w = cache->w;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7264 *bufpos = cache->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7265 *closest = cache->closest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7266 *modeline_closest = cache->modeline_closest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7267 *obj1 = cache->obj1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7268 *obj2 = cache->obj2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7270 return cache->retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7271 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7272 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7273 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7274 *col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7275 *row = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7276 *obj_x = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7277 *obj_y = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7278 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7279 *bufpos = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7280 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7281 *modeline_closest = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7282 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7283 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7284
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7285 low_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7286 high_x_coord = x_coord + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7287 low_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7288 high_y_coord = y_coord + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7289 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7291 if (device_check_failed)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7292 return OVER_NOTHING;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7294 frm_left = FRAME_LEFT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7295 frm_right = FRAME_RIGHT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7296 frm_top = FRAME_TOP_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7297 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7298
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7299 /* Check if the mouse is outside of the text area actually used by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7300 redisplay. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7301 if (y_coord < frm_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7302 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7303 if (y_coord >= FRAME_TOP_BORDER_START (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7304 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7305 low_y_coord = FRAME_TOP_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7306 high_y_coord = frm_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7307 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7308 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7309 else if (y_coord >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7310 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7311 low_y_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7312 high_y_coord = FRAME_TOP_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7313 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7314 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7315 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7316 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7317 low_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7318 high_y_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7319 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7320 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7321 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7322 else if (y_coord >= frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7323 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7324 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7325 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7326 low_y_coord = frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7327 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7328 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7329 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7330 else if (y_coord < FRAME_PIXHEIGHT (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7331 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7332 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7333 high_y_coord = FRAME_PIXHEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7334 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7335 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7336 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7337 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7338 low_y_coord = FRAME_PIXHEIGHT (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7339 high_y_coord = y_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7340 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7341 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7342 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7343
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7344 if (position != OVER_TOOLBAR && position != OVER_BORDER)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7345 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7346 if (x_coord < frm_left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7347 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7348 if (x_coord >= FRAME_LEFT_BORDER_START (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7349 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7350 low_x_coord = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7351 high_x_coord = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7352 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7353 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7354 else if (x_coord >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7355 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7356 low_x_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7357 high_x_coord = FRAME_LEFT_BORDER_START (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7358 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7359 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7360 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7361 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7362 low_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7363 high_x_coord = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7364 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7365 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7366 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7367 else if (x_coord >= frm_right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7368 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7369 if (x_coord < FRAME_RIGHT_BORDER_END (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7370 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7371 low_x_coord = frm_right;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7372 high_x_coord = FRAME_RIGHT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7373 position = OVER_BORDER;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7374 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7375 else if (x_coord < FRAME_PIXWIDTH (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7376 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7377 low_x_coord = FRAME_RIGHT_BORDER_END (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7378 high_x_coord = FRAME_PIXWIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7379 position = OVER_TOOLBAR;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7380 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7381 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7382 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7383 low_x_coord = FRAME_PIXWIDTH (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7384 high_x_coord = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7385 position = OVER_OUTSIDE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7386 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7387 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7388 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7389
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7390 #ifdef HAVE_TOOLBARS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7391 if (position == OVER_TOOLBAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7392 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7393 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7394 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7395 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7396 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7397 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7398 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7399
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7400 /* 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
7401 relative y position even if it is outside the x boundary. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7402 if (x_coord < frm_left)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7403 x_coord = frm_left;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7404 else if (x_coord > frm_right)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7405 x_coord = frm_right;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7407 /* Same in reverse. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7408 if (y_coord < frm_top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7409 y_coord = frm_top;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7410 else if (y_coord > frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7411 y_coord = frm_bottom;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7412
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7413 /* Find what window the given coordinates are actually in. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7414 window = f->root_window;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7415 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
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 we didn't find a window, we're done. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7418 if (!*w)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7419 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7420 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7421 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7422 else if (position != OVER_NOTHING)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7423 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7424 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7425 *modeline_closest = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7427 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7428 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7429 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7430 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7431 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7432 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7433
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7434 /* Check if the window is a minibuffer but isn't active. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7435 if (MINI_WINDOW_P (*w) && !minibuf_level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7436 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7437 /* Must reset the window value since some callers will ignore
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7438 the return value if it is set. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7439 *w = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7440 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7441 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7442
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7443 dla = window_display_lines (*w, CURRENT_DISP);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7445 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7446 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7447 int really_over_nothing = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7448 struct display_line *dl = Dynarr_atp (dla, *row);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7449
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7450 if ((int) (dl->ypos - dl->ascent) <= y_coord
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7451 && y_coord <= (int) (dl->ypos + dl->descent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7452 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7453 int check_margin_glyphs = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7454 struct display_block *db = get_display_block_from_line (dl, TEXT);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7455 struct rune *rb = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7456
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7457 if (x_coord < dl->bounds.left_white
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7458 || x_coord >= dl->bounds.right_white)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7459 check_margin_glyphs = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7460
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7461 low_y_coord = dl->ypos - dl->ascent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7462 high_y_coord = dl->ypos + dl->descent + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7463
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7464 if (position == OVER_BORDER
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7465 || position == OVER_OUTSIDE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7466 || check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7467 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7468 int x_check, left_bound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7469
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7470 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7471 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7472 x_check = x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7473 left_bound = dl->bounds.left_white;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7474 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7475 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7476 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7477 x_check = high_x_coord;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7478 left_bound = frm_left;
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 if (Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7482 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7483 if (x_check <= left_bound)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7484 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7485 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7486 *modeline_closest = Dynarr_atp (db->runes, 0)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7487 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7488 *closest = Dynarr_atp (db->runes, 0)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7489 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7490 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7491 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7492 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7493 *modeline_closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7494 Dynarr_atp (db->runes,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7495 Dynarr_length (db->runes) - 1)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7496 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7497 *closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7498 Dynarr_atp (db->runes,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7499 Dynarr_length (db->runes) - 1)->bufpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7500 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7501
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7502 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7503 *modeline_closest += dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7504 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7505 *closest += dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7506 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7507 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7508 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7509 /* #### What should be here. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7510 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7511 *modeline_closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7512 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7513 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7514 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7516 if (check_margin_glyphs)
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 (x_coord < dl->bounds.left_in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7519 || x_coord >= dl->bounds.right_in)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7520 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7521 /* If we are over the outside margins then we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7522 know the loop over the text block isn't going
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7523 to accomplish anything. So we go ahead and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7524 set what information we can right here and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7525 return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7526 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7527 *obj_y = y_coord - (dl->ypos - dl->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7528 get_position_object (dl, obj1, obj2, x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7529 &low_x_coord, &high_x_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7530
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7531 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7532 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7533 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7534 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7535 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7536 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7538 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7539 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7540 int past_end = (*col == Dynarr_length (db->runes));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7542 if (!past_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7543 rb = Dynarr_atp (db->runes, *col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7544
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7545 if (past_end ||
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7546 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7547 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7548 if (past_end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7549 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7550 (*col)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7551 rb = Dynarr_atp (db->runes, *col);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7552 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7554 *bufpos = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7555 low_x_coord = rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7556 high_x_coord = rb->xpos + rb->width;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7557
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7558 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7559 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7560 int elt = *col + 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7561
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7562 /* Find the first character after the glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7563 while (elt < Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7564 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7565 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7566 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7567 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7568 *modeline_closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7569 (Dynarr_atp (db->runes, elt)->bufpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7570 dl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7571 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7572 *closest =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7573 (Dynarr_atp (db->runes, elt)->bufpos +
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7574 dl->offset);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7575 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7576 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7577
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7578 elt++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7579 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7580
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7581 /* In this case we failed to find a non-glyph
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7582 character so we return the last position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7583 displayed on the line. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7584 if (elt == Dynarr_length (db->runes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7585 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7586 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7587 *modeline_closest = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7588 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7589 *closest = dl->end_bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7590 really_over_nothing = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7591 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7592 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7593 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7594 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7595 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7596 *modeline_closest = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7597 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7598 *closest = rb->bufpos + dl->offset;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7599 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7600
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7601 if (dl->modeline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7602 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7603 *row = window_displayed_height (*w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7604
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7605 if (position == OVER_NOTHING)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7606 position = OVER_MODELINE;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7607
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7608 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7609 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7610 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7611 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7612 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7613 else if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7614 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7615 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7616 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7617 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7618 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7619 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7620 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7621 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7622 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7623
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7624 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7625 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7626 else if (past_end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7627 || (rb->type == RUNE_CHAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7628 && rb->object.chr.ch == '\n'))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7629 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7630 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7631 /* At this point we may have glyphs in the right
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7632 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7633 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7634 get_position_object (dl, obj1, obj2, x_coord,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7635 &low_x_coord, &high_x_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7636 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7637 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7638 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7639 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7640 (*row)--;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7641 if (rb->type == RUNE_DGLYPH)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7642 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7643 *obj1 = rb->object.dglyph.glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7644 *obj2 = rb->object.dglyph.extent;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7645 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7646 else if (rb->type == RUNE_CHAR)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7647 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7648 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7649 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7650 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7651 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7652 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7653 *obj1 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7654 *obj2 = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7655 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7656
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7657 *obj_x = x_coord - rb->xpos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7658 *obj_y = y_coord - (dl->ypos - dl->ascent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7659
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7660 /* At this point we may have glyphs in the left
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7661 inside margin. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7662 if (check_margin_glyphs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7663 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7664
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7665 if (position == OVER_NOTHING && !really_over_nothing)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7666 position = OVER_TEXT;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7667
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7668 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7669 }
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 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7673 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7674
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7675 *row = Dynarr_length (dla) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7676 if (FRAME_WIN_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7677 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7678 int bot_elt = Dynarr_length (dla) - 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7679
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7680 if (bot_elt >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7681 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7682 struct display_line *dl = Dynarr_atp (dla, bot_elt);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7683 int adj_area = y_coord - (dl->ypos + dl->descent);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7684 Lisp_Object lwin = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7685 int defheight;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7687 XSETWINDOW (lwin, *w);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7688 default_face_height_and_width (lwin, 0, &defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7689
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7690 *row += (adj_area / defheight);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7691 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7692 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7693
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7694 /* #### This should be checked out some more to determine what
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7695 should really be going on. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7696 if (!MARKERP ((*w)->start[CURRENT_DISP]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7697 *closest = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7698 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7699 *closest = end_of_last_line (*w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7700 marker_position ((*w)->start[CURRENT_DISP]));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7701 *col = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7702 UPDATE_CACHE_RETURN;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7703 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7704 #undef UPDATE_CACHE_RETURN
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7705
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7706
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7707 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7708 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7709 /* Lisp functions */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7710 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7711 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7712
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7713 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, Sredisplay_echo_area,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7714 0, 0, 0 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7715 Ensure that all minibuffers are correctly showing the echo area.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7716 */ )
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 Lisp_Object devcons, concons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7720
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7721 DEVICE_LOOP_NO_BREAK (devcons, concons)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7722 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7723 struct device *d = XDEVICE (XCAR (devcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7724 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7725
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7726 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7727 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7728 struct frame *f = XFRAME (XCAR (frmcons));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7729
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7730 if (FRAME_VISIBLE_P (f) && FRAME_HAS_MINIBUF_P (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7731 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7732 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7733 redisplay_window (window, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7734 call_redisplay_end_triggers (XWINDOW (window), 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7735 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7736 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7737
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7738 /* We now call the output_end routine for tty frames. We delay
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7739 doing so in order to avoid cursor flicker. So much for 100%
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7740 encapsulation. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7741 if (DEVICE_TTY_P (d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7742 DEVMETH (d, output_end, (d));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7743 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7745 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7746 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7747
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7748 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7749 restore_disable_preemption_value (Lisp_Object value)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7750 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7751 disable_preemption = XINT (value);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7752 return Qnil;
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 DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 0, 2, 0 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7756 Clear frame FRAME and output again what is supposed to appear on it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7757 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7758 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7759 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
7760 input and is guaranteed to proceed to completion.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7761 */ )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7762 (frame, no_preempt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7763 Lisp_Object frame, no_preempt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7764 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7765 struct frame *f = decode_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7766 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7767
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7768 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7769 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7770 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7771 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7772 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7773 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7774
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7775 f->clear = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7776 redisplay_frame (f, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7777
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7778 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7779 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7780
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7781 DEFUN ("redisplay-frame", Fredisplay_frame, Sredisplay_frame, 0, 2, 0 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7782 Ensure that FRAME's contents are correctly displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7783 This differs from `redraw-frame' in that it only redraws what needs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7784 be updated, as opposed to unconditionally clearing and redrawing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7785 the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7786 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7787 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7788 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
7789 input and is guaranteed to proceed to completion.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7790 */ )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7791 (frame, no_preempt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7792 Lisp_Object frame, no_preempt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7793 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7794 struct frame *f = decode_frame (frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7795 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7796
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7797 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7798 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7799 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7800 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7801 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7802 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7803
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7804 redisplay_frame (f, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7805
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7806 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7807 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7808
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7809 DEFUN ("redraw-device", Fredraw_device, Sredraw_device, 0, 2, 0 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7810 Clear device DEVICE and output again what is supposed to appear on it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7811 DEVICE defaults to the selected device if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7812 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7813 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
7814 input and is guaranteed to proceed to completion.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7815 */ )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7816 (device, no_preempt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7817 Lisp_Object device, no_preempt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7818 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7819 struct device *d = decode_device (device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7820 Lisp_Object frmcons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7821 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7822
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7823 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7824 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7825 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7826 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7827 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7828 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7830 DEVICE_FRAME_LOOP (frmcons, d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7831 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7832 XFRAME (XCAR (frmcons))->clear = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7833 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7834 redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7835
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7836 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7837 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7839 DEFUN ("redisplay-device", Fredisplay_device, Sredisplay_device, 0, 2, 0 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7840 Ensure that DEVICE's contents are correctly displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7841 This differs from `redraw-device' in that it only redraws what needs to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7842 be updated, as opposed to unconditionally clearing and redrawing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7843 the device.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7844 DEVICE defaults to the selected device if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7845 Normally, redisplay is preempted as normal if input arrives. However,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7846 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
7847 input and is guaranteed to proceed to completion.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7848 */ )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7849 (device, no_preempt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7850 Lisp_Object device, no_preempt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7851 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7852 struct device *d = decode_device (device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7853 int count = specpdl_depth ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7854
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7855 if (!NILP (no_preempt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7856 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7857 record_unwind_protect (restore_disable_preemption_value,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7858 make_int (disable_preemption));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7859 disable_preemption++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7860 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7862 redisplay_device (d);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7863
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7864 return unbind_to (count, Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7865 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7867 /* Big lie. Big lie. This will force all modelines to be updated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7868 regardless if the all flag is set or not. It remains in existence
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7869 solely for backwards compatibility. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7870 DEFUN ("redraw-modeline", Fredraw_modeline, Sredraw_modeline, 0, 1, 0 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7871 Force the modeline of the current buffer to be redisplayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7872 With optional non-nil ALL, force redisplay of all modelines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7873 */ )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7874 (all)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7875 Lisp_Object all;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7876 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7877 MARK_MODELINE_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7878 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7879 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7880
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7881 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7882 Sforce_cursor_redisplay, 0, 1, 0 /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7883 Force an immediate update of the cursor on FRAME.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7884 FRAME defaults to the selected frame if omitted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7885 */ )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7886 (frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7887 Lisp_Object frame;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7888 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7889 redisplay_redraw_cursor (decode_frame (frame), 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7890 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7891 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7892
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7893
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7894 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7895 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7896 /* Lisp-variable change triggers */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7897 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7898 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7899
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7900 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7901 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7902 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7903 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7904 /* Nothing to be done? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7905 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7906
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7907 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7908 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7909 Lisp_Object in_object, int flags)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7910 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7911 /* #### clip_changed should really be renamed something like
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7912 global_redisplay_change. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7913 MARK_CLIP_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7914 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7915 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7916
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7917 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7918 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7919 Lisp_Object locale)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7920 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7921 MARK_CLIP_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7922 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7923
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7924 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7925 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7926 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7927 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7928 if (XFRAME (w->frame)->init_finished)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7929 Fforce_cursor_redisplay (w->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7930 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7931
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7932 #ifdef MEMORY_USAGE_STATS
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 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7937 /* memory usage computation */
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7941 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7942 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7943 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7944 int total = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7945
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7946 if (dyn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7947 total += Dynarr_memory_usage (dyn, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7948
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7949 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7950 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7951
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7952 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7953 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7954 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7955 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7956 int total = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7957
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7958 if (dyn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7959 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7960 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7961
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7962 total += Dynarr_memory_usage (dyn, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7963 for (i = 0; i < Dynarr_largest (dyn); i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7964 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7965 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7966
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7967 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7968 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7969
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7970 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7971 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7972 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7973 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7974 int total = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7975
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7976 if (dyn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7977 total += Dynarr_memory_usage (dyn, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7978
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7979 return total;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7980 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7981
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7982 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7983 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7984 struct overhead_stats *ovstats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7985 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7986 int total = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7988 if (dyn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7989 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7990 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7992 total += Dynarr_memory_usage (dyn, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7993 for (i = 0; i < Dynarr_largest (dyn); i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7994 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7995 total +=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7996 compute_display_block_dynarr_usage (Dynarr_at (dyn, i).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7997 display_blocks, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7998 total +=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7999 compute_glyph_block_dynarr_usage (Dynarr_at (dyn, i).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8000 left_glyphs, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8001 total +=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8002 compute_glyph_block_dynarr_usage (Dynarr_at (dyn, i).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8003 right_glyphs, ovstats);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8004 }
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 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8011 compute_line_start_cache_dynarr_usage (line_start_cache_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 #endif /* MEMORY_USAGE_STATS */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8023
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8024
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8025 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8026 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8027 /* initialization */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8028 /* */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8029 /***************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8030
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8031 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8032 init_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8033 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8034 disable_preemption = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8035 preemption_count = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8036 max_preempts = INIT_MAX_PREEMPTS;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8038 if (!initialized)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8039 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8040 cmotion_display_lines = Dynarr_new (struct display_line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8041 mode_spec_bufbyte_string = Dynarr_new (Bufbyte);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8042 formatted_string_emchar_dynarr = Dynarr_new (Emchar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8043 formatted_string_extent_dynarr = Dynarr_new (struct extent *);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8044 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8045 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8046 internal_cache = Dynarr_new (struct line_start_cache);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8047 memset (&formatted_string_display_line, 0, sizeof (struct display_line));
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 /* window system is nil when in -batch mode */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8051 if (!initialized || noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8052 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8053
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8054 /* If the user wants to use a window system, we shouldn't bother
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8055 initializing the terminal. This is especially important when the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8056 terminal is so dumb that emacs gives up before and doesn't bother
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8057 using the window system.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8058
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8059 If the DISPLAY environment variable is set, try to use X, and die
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8060 with an error message if that doesn't work. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8061
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8062 #ifdef HAVE_X_WINDOWS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8063 if (!strcmp (display_use, "x"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8064 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8065 /* Some stuff checks this way early. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8066 Vwindow_system = Qx;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8067 Vinitial_window_system = Qx;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8068 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8069 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8070 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8071 #ifdef HAVE_NEXTSTEP
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8072 if (!strcmp (display_use, "ns"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8073 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8074 Vwindow_system = Qns;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8075 Vinitial_window_system = Qns;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8076 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8077 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8078 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8079
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8080 /* If no window system has been specified, try to use the terminal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8081 if (!isatty (0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8082 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8083 stderr_out ("XEmacs: standard input is not a tty\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8084 exit (1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8085 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8086
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8087 /* Look at the TERM variable */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8088 if (!getenv ("TERM"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8089 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8090 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8091 exit (1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8092 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8093
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8094 Vinitial_window_system = Qtty;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8095 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8096
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8097 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8098 syms_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8099 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8100 defsymbol (&Qcursor_in_echo_area, "cursor-in-echo-area");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8101 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8102 defsymbol (&Qpre_redisplay_hook, "pre-redisplay-hook");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8103 defsymbol (&Qpost_redisplay_hook, "post-redisplay-hook");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8104 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8105 defsymbol (&Qdisplay_warning_buffer, "display-warning-buffer");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8106 defsymbol (&Qbar_cursor, "bar-cursor");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8107 defsymbol (&Qwindow_scroll_functions, "window-scroll-functions");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8108 defsymbol (&Qredisplay_end_trigger_functions,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8109 "redisplay-end-trigger-functions");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8111 defsubr (&Sredisplay_echo_area);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8112 defsubr (&Sredraw_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8113 defsubr (&Sredisplay_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8114 defsubr (&Sredraw_device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8115 defsubr (&Sredisplay_device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8116 defsubr (&Sredraw_modeline);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8117 defsubr (&Sforce_cursor_redisplay);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8118 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8120 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8121 vars_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8122 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8123 #if 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8124 staticpro (&last_arrow_position);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8125 staticpro (&last_arrow_string);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8126 last_arrow_position = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8127 last_arrow_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8128 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8130 updating_line_start_cache = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8132 /* #### Probably temporary */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8133 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8134 (Temporary) Setting this will impact the performance of the internal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8135 line start cache.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8136 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8137 cache_adjustment = 2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8139 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8140 Minimum pixel height for clipped bottom display line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8141 A clipped line shorter than this won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8142 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8143 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8144 vertical_clip = 5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8146 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8147 Minimum visible area for clipped glyphs at right boundary.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8148 Clipped glyphs shorter than this won't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8149 Only pixmap glyph instances are currently allowed to be clipped.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8150 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8151 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8152 horizontal_clip = 5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8154 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8155 String displayed by modeline-format's \"%m\" specification.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8156 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8157 Vglobal_mode_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8158
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8159 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8160 Marker for where to display an arrow on top of the buffer text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8161 This must be the beginning of a line in order to work.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8162 See also `overlay-arrow-string'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8163 */ , redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8164 Voverlay_arrow_position = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8165
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8166 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8167 String to display as an arrow. See also `overlay-arrow-position'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8168 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8169 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8170 Voverlay_arrow_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8171
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8172 DEFVAR_INT ("scroll-step", &scroll_step /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8173 *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
8174 If that fails to bring point back on frame, point is centered instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8175 If this is zero, point is always centered after it moves off screen.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8176 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8177
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8178 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8179 &truncate_partial_width_windows /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8180 *Non-nil means truncate lines in all windows less than full frame wide.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8181 */ ,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8182 redisplay_variable_changed);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8183 truncate_partial_width_windows = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8185 DEFVAR_BOOL ("visible-bell", &visible_bell /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8186 *Non-nil means try to flash the frame to represent a bell.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8187 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8188 visible_bell = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8190 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8191 *Non-nil means no need to redraw entire frame after suspending.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8192 A non-nil value is useful if the terminal can automatically preserve
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8193 Emacs's frame display when you reenter Emacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8194 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
8195 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8196 no_redraw_on_reenter = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8197
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8198 /* #### This should be removed in 19.14 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8199 DEFVAR_LISP ("window-system", &Vwindow_system /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8200 A symbol naming the window-system under which Emacs is running,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8201 such as `x', or nil if emacs is running on an ordinary terminal.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8202 This variable is OBSOLETE and will be removed in a future version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8203 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8204 Vwindow_system = 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 /* #### Temporary shit until window-system is eliminated. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8207 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8208 DON'T TOUCH
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8209 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8210 Vinitial_window_system = 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_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8213 Non-nil means put cursor in minibuffer, at end of any message there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8214 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8215 cursor_in_echo_area = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8216
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8217 /* #### Shouldn't this be generalized as follows:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8218
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8219 if nil, use block cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8220 if a number, use a bar cursor of that width.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8221 Otherwise, use a 1-pixel bar cursor.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8222
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8223 #### Or better yet, this variable should be trashed entirely
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8224 (use a Lisp-magic variable to maintain compatibility)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8225 and a specifier `cursor-shape' added, which allows a block
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8226 cursor, a bar cursor, a flashing block or bar cursor,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8227 maybe a caret cursor, etc. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8228
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8229 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8230 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
8231 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8232 Vbar_cursor = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8233
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8234 #ifndef INHIBIT_REDISPLAY_HOOKS
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8235 xxDEFVAR_LISP ("pre-redisplay-hook", &Vpre_redisplay_hook /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8236 Function or functions to run before every redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8237 Functions on this hook must be careful to avoid signalling errors!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8238 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8239 Vpre_redisplay_hook = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8240
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8241 xxDEFVAR_LISP ("post-redisplay-hook", &Vpost_redisplay_hook /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8242 Function or functions to run after every redisplay.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8243 Functions on this hook must be careful to avoid signalling errors!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8244 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8245 Vpost_redisplay_hook = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8246 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8247
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8248 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8249 Bump this to tell the C code to call `display-warning-buffer'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8250 at next redisplay. You should not normally change this; the function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8251 `display-warning' automatically does this at appropriate times.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8252 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8253 display_warning_tick = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8254
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8255 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8256 Non-nil means inhibit display of warning messages.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8257 You should *bind* this, not set it. Any pending warning messages
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8258 will be displayed when the binding no longer applies.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8259 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8260 /* reset to 0 by startup.el after the splash screen has displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8261 This way, the warnings don't obliterate the splash screen. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8262 inhibit_warning_display = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8263
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8264 DEFVAR_LISP ("window-size-change-functions",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8265 &Vwindow_size_change_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8266 Not currently implemented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8267 Functions called before redisplay, if window sizes have changed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8268 The value should be a list of functions that take one argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8269 Just before redisplay, for each frame, if any of its windows have changed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8270 size since the last redisplay, or have been split or deleted,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8271 all the functions in the list are called, with the frame as argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8272 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8273 Vwindow_size_change_functions = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8274
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8275 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8276 Not currently implemented.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8277 Functions to call before redisplaying a window with scrolling.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8278 Each function is called with two arguments, the window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8279 and its new display-start position. Note that the value of `window-end'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8280 is not valid when these functions are called.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8281 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8282 Vwindow_scroll_functions = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8283
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8284 DEFVAR_LISP ("redisplay-end-trigger-functions",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8285 &Vredisplay_end_trigger_functions /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8286 See `set-window-redisplay-end-trigger'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8287 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8288 Vredisplay_end_trigger_functions = Qnil;
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
8289
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
8290 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
8291 Non-nil means column display number starts at 1.
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
8292 */ );
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
8293 column_number_start_at_one = 1;
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
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8296 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8297 specifier_vars_of_redisplay (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8298 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8299 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8300 *Width of left margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8301 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8302 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8303 Vleft_margin_width = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8304 set_specifier_fallback
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8305 (Vleft_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8306 list1 (Fcons (Qnil, Qzero)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8307 set_specifier_caching (Vleft_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8308 slot_offset (struct window, left_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8309 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8310 slot_offset (struct frame, left_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8311 margin_width_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8312
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8313 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8314 *Width of right margin.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8315 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8316 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8317 Vright_margin_width = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8318 set_specifier_fallback
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8319 (Vright_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8320 list1 (Fcons (Qnil, Qzero)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8321 set_specifier_caching (Vright_margin_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8322 slot_offset (struct window, right_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8323 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8324 slot_offset (struct frame, right_margin_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8325 margin_width_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8326
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8327 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8328 *Minimum ascent height of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8329 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8330 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8331 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8332 set_specifier_fallback (Vminimum_line_ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8333 list1 (Fcons (Qnil, Qzero)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8334 set_specifier_caching (Vminimum_line_ascent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8335 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8336 minimum_line_ascent),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8337 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8338 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8339
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8340 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8341 *Minimum descent height of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8342 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8343 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8344 Vminimum_line_descent = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8345 set_specifier_fallback (Vminimum_line_descent,
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 (Vminimum_line_descent,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8348 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8349 minimum_line_descent),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8350 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8351 0, 0);
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 ("use-left-overflow", &Vuse_left_overflow /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8354 *Non-nil means use the left outside margin as extra whitespace when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8355 displaying 'whitespace or 'inside-margin glyphs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8356 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8357 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8358 Vuse_left_overflow = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8359 set_specifier_fallback (Vuse_left_overflow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8360 list1 (Fcons (Qnil, Qnil)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8361 set_specifier_caching (Vuse_left_overflow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8362 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8363 use_left_overflow),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8364 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8365 0, 0);
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 ("use-right-overflow", &Vuse_right_overflow /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8368 *Non-nil means use the right outside margin as extra whitespace when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8369 displaying 'whitespace or 'inside-margin glyphs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8370 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8371 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8372 Vuse_right_overflow = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8373 set_specifier_fallback (Vuse_right_overflow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8374 list1 (Fcons (Qnil, Qnil)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8375 set_specifier_caching (Vuse_right_overflow,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8376 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8377 use_right_overflow),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8378 some_window_value_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8379 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8380
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8381 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8382 *Non-nil means the text cursor is visible (this is usually the case).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8383 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8384 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8385 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8386 set_specifier_fallback (Vtext_cursor_visible_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8387 list1 (Fcons (Qnil, Qt)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8388 set_specifier_caching (Vtext_cursor_visible_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8389 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8390 text_cursor_visible_p),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8391 text_cursor_visible_p_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8392 0, 0);
4
b82b59fe008d Import from CVS: tag r19-15b3
cvs
parents: 2
diff changeset
8393
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8394 }