Mercurial > emacs
annotate src/dispnew.c @ 35283:ac715b4413f7
new backquote syntax
author | Sam Steingold <sds@gnu.org> |
---|---|
date | Fri, 12 Jan 2001 22:49:40 +0000 |
parents | ec15c68b25ba |
children | 8e3c6f1a31ab |
rev | line source |
---|---|
314 | 1 /* Updating of data structures for redisplay. |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 1999, 2000 |
18853
4501a367a887
(direct_output_forward_char): Reenable check against
Richard M. Stallman <rms@gnu.org>
parents:
18774
diff
changeset
|
3 Free Software Foundation, Inc. |
314 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1766
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
314 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14125
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14125
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
314 | 21 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
22 #include <config.h> |
314 | 23 #include <signal.h> |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7814
diff
changeset
|
24 #include <stdio.h> |
314 | 25 #include <ctype.h> |
26 | |
21514 | 27 #ifdef HAVE_UNISTD_H |
28 #include <unistd.h> | |
29 #endif | |
30 | |
3525
58e789baa27a
Include lisp.h earlier (before termhooks.h).
Richard M. Stallman <rms@gnu.org>
parents:
3517
diff
changeset
|
31 #include "lisp.h" |
314 | 32 #include "termchar.h" |
33 #include "termopts.h" | |
2198 | 34 #include "termhooks.h" |
13526
34382f4e23cb
Always include dispextern.h before cm.h.
Richard M. Stallman <rms@gnu.org>
parents:
13448
diff
changeset
|
35 /* cm.h must come after dispextern.h on Windows. */ |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
36 #include "dispextern.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
37 #include "cm.h" |
314 | 38 #include "buffer.h" |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
39 #include "charset.h" |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
40 #include "keyboard.h" |
764 | 41 #include "frame.h" |
314 | 42 #include "window.h" |
43 #include "commands.h" | |
44 #include "disptab.h" | |
45 #include "indent.h" | |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
46 #include "intervals.h" |
15065 | 47 #include "blockinput.h" |
21514 | 48 #include "process.h" |
314 | 49 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
50 /* I don't know why DEC Alpha OSF1 fail to compile this file if we |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
51 include the following file. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
52 /* #include "systty.h" */ |
12917 | 53 #include "syssignal.h" |
554 | 54 |
314 | 55 #ifdef HAVE_X_WINDOWS |
56 #include "xterm.h" | |
25012 | 57 #endif /* HAVE_X_WINDOWS */ |
314 | 58 |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
59 #ifdef HAVE_NTGUI |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
60 #include "w32term.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
61 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
62 |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
63 #ifdef macintosh |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
64 #include "macterm.h" |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
65 #endif /* macintosh */ |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
66 |
25012 | 67 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ |
68 | |
7808
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
69 #include "systime.h" |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
70 #include <errno.h> |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
71 |
25012 | 72 /* To get the prototype for `sleep'. */ |
73 | |
74 #ifdef HAVE_UNISTD_H | |
75 #include <unistd.h> | |
76 #endif | |
77 | |
314 | 78 #define max(a, b) ((a) > (b) ? (a) : (b)) |
79 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
80 | |
81 /* Get number of chars of output now in the buffer of a stdio stream. | |
25012 | 82 This ought to be built in in stdio, but it isn't. Some s- files |
83 override this because their stdio internals differ. */ | |
84 | |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
85 #ifdef __GNU_LIBRARY__ |
25012 | 86 |
87 /* The s- file might have overridden the definition with one that | |
88 works for the system's C library. But we are using the GNU C | |
89 library, so this is the right definition for every system. */ | |
90 | |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
91 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
92 #define PENDING_OUTPUT_COUNT GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
93 #else |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
94 #undef PENDING_OUTPUT_COUNT |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
95 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer) |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
96 #endif |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
97 #else /* not __GNU_LIBRARY__ */ |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
98 #if !defined (PENDING_OUTPUT_COUNT) && HAVE_STDIO_EXT_H && HAVE___FPENDING |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
99 #include <stdio_ext.h> |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
100 #define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE) |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
101 #endif |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
102 #ifndef PENDING_OUTPUT_COUNT |
314 | 103 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) |
104 #endif | |
25012 | 105 #endif /* not __GNU_LIBRARY__ */ |
106 | |
29437 | 107 #if defined (LINUX) && defined (HAVE_LIBNCURSES) |
108 #include <term.h> /* for tgetent */ | |
109 #endif | |
25012 | 110 |
111 /* Structure to pass dimensions around. Used for character bounding | |
112 boxes, glyph matrix dimensions and alike. */ | |
113 | |
114 struct dim | |
115 { | |
116 int width; | |
117 int height; | |
118 }; | |
119 | |
120 | |
121 /* Function prototypes. */ | |
122 | |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
123 static void save_or_restore_current_matrix P_ ((struct frame *, int)); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
124 static void fake_current_matrices P_ ((Lisp_Object)); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
125 static void redraw_overlapping_rows P_ ((struct window *, int)); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
126 static void redraw_overlapped_rows P_ ((struct window *, int)); |
25012 | 127 static int count_blanks P_ ((struct glyph *, int)); |
128 static int count_match P_ ((struct glyph *, struct glyph *, | |
129 struct glyph *, struct glyph *)); | |
130 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int)); | |
131 static void update_frame_line P_ ((struct frame *, int)); | |
132 static struct dim allocate_matrices_for_frame_redisplay | |
133 P_ ((Lisp_Object, int, int, struct dim, int, int *)); | |
134 static void allocate_matrices_for_window_redisplay P_ ((struct window *, | |
135 struct dim)); | |
136 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim)); | |
137 static void adjust_frame_glyphs P_ ((struct frame *)); | |
138 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *)); | |
139 static void free_glyph_matrix P_ ((struct glyph_matrix *)); | |
140 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *, | |
141 int, int, struct dim)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
142 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); |
25012 | 143 static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *)); |
34895
53e52b3525bf
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34893
diff
changeset
|
144 #if GLYPH_DEBUG |
25012 | 145 static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *)); |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
146 #endif |
25012 | 147 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); |
148 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *, | |
149 struct window *)); | |
150 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *, | |
151 struct window *)); | |
152 static struct glyph_pool *new_glyph_pool P_ ((void)); | |
153 static void free_glyph_pool P_ ((struct glyph_pool *)); | |
154 static void adjust_frame_glyphs_initially P_ ((void)); | |
155 static void adjust_frame_message_buffer P_ ((struct frame *)); | |
156 static void adjust_decode_mode_spec_buffer P_ ((struct frame *)); | |
157 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *)); | |
158 static void build_frame_matrix P_ ((struct frame *)); | |
159 void clear_current_matrices P_ ((struct frame *)); | |
160 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int, | |
161 int, int)); | |
162 static void clear_window_matrices P_ ((struct window *, int)); | |
163 static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int)); | |
164 static int scrolling_window P_ ((struct window *, int)); | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
165 static int update_window_line P_ ((struct window *, int, int *)); |
25012 | 166 static void update_marginal_area P_ ((struct window *, int, int)); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
167 static int update_text_area P_ ((struct window *, int)); |
25012 | 168 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *, |
169 int)); | |
170 static void mirror_make_current P_ ((struct window *, int)); | |
171 void check_window_matrix_pointers P_ ((struct window *)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
172 #if GLYPH_DEBUG |
25012 | 173 static void check_matrix_pointers P_ ((struct glyph_matrix *, |
174 struct glyph_matrix *)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
175 #endif |
25012 | 176 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *)); |
177 static int update_window_tree P_ ((struct window *, int)); | |
178 static int update_window P_ ((struct window *, int)); | |
179 static int update_frame_1 P_ ((struct frame *, int, int)); | |
180 static void set_window_cursor_after_update P_ ((struct window *)); | |
181 static int row_equal_p P_ ((struct window *, struct glyph_row *, | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
182 struct glyph_row *, int)); |
25012 | 183 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *)); |
184 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *)); | |
185 static void reverse_rows P_ ((struct glyph_matrix *, int, int)); | |
186 static int margin_glyphs_to_reserve P_ ((struct window *, int, Lisp_Object)); | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
187 static void sync_window_with_frame_matrix_rows P_ ((struct window *)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
188 struct window *frame_row_to_window P_ ((struct window *, int)); |
25012 | 189 |
190 | |
191 /* Non-zero means don't pause redisplay for pending input. (This is | |
192 for debugging and for a future implementation of EDT-like | |
193 scrolling. */ | |
194 | |
195 int redisplay_dont_pause; | |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
196 |
554 | 197 /* Nonzero upon entry to redisplay means do not assume anything about |
764 | 198 current contents of actual terminal frame; clear and redraw it. */ |
314 | 199 |
764 | 200 int frame_garbaged; |
314 | 201 |
25012 | 202 /* Nonzero means last display completed. Zero means it was preempted. */ |
314 | 203 |
204 int display_completed; | |
205 | |
25012 | 206 /* Lisp variable visible-bell; enables use of screen-flash instead of |
207 audible bell. */ | |
314 | 208 |
209 int visible_bell; | |
210 | |
764 | 211 /* Invert the color of the whole frame, at a low level. */ |
314 | 212 |
213 int inverse_video; | |
214 | |
215 /* Line speed of the terminal. */ | |
216 | |
217 int baud_rate; | |
218 | |
25012 | 219 /* Either nil or a symbol naming the window system under which Emacs |
220 is running. */ | |
314 | 221 |
222 Lisp_Object Vwindow_system; | |
223 | |
224 /* Version number of X windows: 10, 11 or nil. */ | |
25012 | 225 |
314 | 226 Lisp_Object Vwindow_system_version; |
227 | |
25012 | 228 /* Vector of glyph definitions. Indexed by glyph number, the contents |
229 are a string which is how to output the glyph. | |
314 | 230 |
231 If Vglyph_table is nil, a glyph is output by using its low 8 bits | |
25012 | 232 as a character code. |
233 | |
234 This is an obsolete feature that is no longer used. The variable | |
235 is retained for compatibility. */ | |
314 | 236 |
237 Lisp_Object Vglyph_table; | |
238 | |
239 /* Display table to use for vectors that don't specify their own. */ | |
240 | |
241 Lisp_Object Vstandard_display_table; | |
242 | |
25012 | 243 /* Nonzero means reading single-character input with prompt so put |
244 cursor on mini-buffer after the prompt. positive means at end of | |
245 text in echo area; negative means at beginning of line. */ | |
246 | |
314 | 247 int cursor_in_echo_area; |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
248 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
249 Lisp_Object Qdisplay_table, Qredisplay_dont_pause; |
25012 | 250 |
314 | 251 |
25012 | 252 /* The currently selected frame. In a single-frame version, this |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
253 variable always equals the_only_frame. */ |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
254 |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
255 Lisp_Object selected_frame; |
25012 | 256 |
257 /* A frame which is not just a mini-buffer, or 0 if there are no such | |
764 | 258 frames. This is usually the most recent such frame that was |
9572 | 259 selected. In a single-frame version, this variable always holds |
260 the address of the_only_frame. */ | |
25012 | 261 |
262 struct frame *last_nonminibuf_frame; | |
263 | |
264 /* Stdio stream being used for copy of all output. */ | |
265 | |
266 FILE *termscript; | |
267 | |
268 /* Structure for info on cursor positioning. */ | |
269 | |
270 struct cm Wcm; | |
271 | |
272 /* 1 means SIGWINCH happened when not safe. */ | |
273 | |
274 int delayed_size_change; | |
275 | |
276 /* 1 means glyph initialization has been completed at startup. */ | |
277 | |
278 static int glyphs_initialized_initially_p; | |
279 | |
280 /* Updated window if != 0. Set by update_window. */ | |
281 | |
282 struct window *updated_window; | |
283 | |
284 /* Glyph row updated in update_window_line, and area that is updated. */ | |
285 | |
286 struct glyph_row *updated_row; | |
287 int updated_area; | |
288 | |
289 /* A glyph for a space. */ | |
290 | |
291 struct glyph space_glyph; | |
292 | |
293 /* Non-zero means update has been performed directly, so that there's | |
294 no need for redisplay_internal to do much work. Set by | |
295 direct_output_for_insert. */ | |
296 | |
297 int redisplay_performed_directly_p; | |
298 | |
299 /* Counts of allocated structures. These counts serve to diagnose | |
300 memory leaks and double frees. */ | |
301 | |
302 int glyph_matrix_count; | |
303 int glyph_pool_count; | |
304 | |
305 /* If non-null, the frame whose frame matrices are manipulated. If | |
306 null, window matrices are worked on. */ | |
307 | |
308 static struct frame *frame_matrix_frame; | |
309 | |
310 /* Current interface for window-based redisplay. Set from init_xterm. | |
311 A null value means we are not using window-based redisplay. */ | |
312 | |
313 struct redisplay_interface *rif; | |
314 | |
315 /* Non-zero means that fonts have been loaded since the last glyph | |
316 matrix adjustments. Redisplay must stop, and glyph matrices must | |
317 be adjusted when this flag becomes non-zero during display. The | |
318 reason fonts can be loaded so late is that fonts of fontsets are | |
319 loaded on demand. */ | |
320 | |
321 int fonts_changed_p; | |
322 | |
323 /* Convert vpos and hpos from frame to window and vice versa. | |
324 This may only be used for terminal frames. */ | |
325 | |
326 #if GLYPH_DEBUG | |
327 | |
328 static int window_to_frame_vpos P_ ((struct window *, int)); | |
329 static int window_to_frame_hpos P_ ((struct window *, int)); | |
330 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) | |
331 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) | |
332 | |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
333 /* One element of the ring buffer containing redisplay history |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
334 information. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
335 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
336 struct redisplay_history |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
337 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
338 char trace[512 + 100]; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
339 }; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
340 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
341 /* The size of the history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
342 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
343 #define REDISPLAY_HISTORY_SIZE 30 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
344 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
345 /* The redisplay history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
346 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
347 static struct redisplay_history redisplay_history[REDISPLAY_HISTORY_SIZE]; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
348 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
349 /* Next free entry in redisplay_history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
350 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
351 static int history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
352 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
353 /* A tick that's incremented each time something is added to the |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
354 history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
355 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
356 static unsigned history_tick; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
357 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
358 static void add_frame_display_history P_ ((struct frame *, int)); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
359 static void add_window_display_history P_ ((struct window *, char *, int)); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
360 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
361 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
362 /* Add to the redisplay history how window W has been displayed. |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
363 MSG is a trace containing the information how W's glyph matrix |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
364 has been contructed. PAUSED_P non-zero means that the update |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
365 has been interrupted for pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
366 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
367 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
368 add_window_display_history (w, msg, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
369 struct window *w; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
370 char *msg; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
371 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
372 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
373 char *buf; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
374 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
375 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
376 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
377 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
378 ++history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
379 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
380 sprintf (buf, "%d: window %p (`%s')%s\n", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
381 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
382 w, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
383 ((BUFFERP (w->buffer) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
384 && STRINGP (XBUFFER (w->buffer)->name)) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
385 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
386 : "???"), |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
387 paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
388 strcat (buf, msg); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
389 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
390 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
391 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
392 /* Add to the redisplay history that frame F has been displayed. |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
393 PAUSED_P non-zero means that the update has been interrupted for |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
394 pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
395 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
396 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
397 add_frame_display_history (f, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
398 struct frame *f; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
399 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
400 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
401 char *buf; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
402 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
403 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
404 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
405 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
406 ++history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
407 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
408 sprintf (buf, "%d: update frame %p%s", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
409 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
410 f, paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
411 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
412 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
413 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
414 DEFUN ("dump-redisplay-history", Fdump_redisplay_history, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
415 Sdump_redisplay_history, 0, 0, "", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
416 "Dump redisplay history to stderr.") |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
417 () |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
418 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
419 int i; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
420 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
421 for (i = history_idx - 1; i != history_idx; --i) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
422 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
423 if (i < 0) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
424 i = REDISPLAY_HISTORY_SIZE - 1; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
425 fprintf (stderr, "%s\n", redisplay_history[i].trace); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
426 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
427 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
428 return Qnil; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
429 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
430 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
431 |
25012 | 432 #else /* GLYPH_DEBUG == 0 */ |
433 | |
434 #define WINDOW_TO_FRAME_VPOS(W, VPOS) ((VPOS) + XFASTINT ((W)->top)) | |
435 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + XFASTINT ((W)->left)) | |
436 | |
437 #endif /* GLYPH_DEBUG == 0 */ | |
438 | |
439 | |
440 /* Like bcopy except never gets confused by overlap. Let this be the | |
441 first function defined in this file, or change emacs.c where the | |
442 address of this function is used. */ | |
314 | 443 |
444 void | |
445 safe_bcopy (from, to, size) | |
446 char *from, *to; | |
447 int size; | |
448 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
449 if (size <= 0 || from == to) |
314 | 450 return; |
451 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
452 /* If the source and destination don't overlap, then bcopy can |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
453 handle it. If they do overlap, but the destination is lower in |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
454 memory than the source, we'll assume bcopy can handle that. */ |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
455 if (to < from || from + size <= to) |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
456 bcopy (from, to, size); |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
457 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
458 /* Otherwise, we'll copy from the end. */ |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
459 else |
314 | 460 { |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
461 register char *endf = from + size; |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
462 register char *endt = to + size; |
314 | 463 |
464 /* If TO - FROM is large, then we should break the copy into | |
465 nonoverlapping chunks of TO - FROM bytes each. However, if | |
466 TO - FROM is small, then the bcopy function call overhead | |
467 makes this not worth it. The crossover point could be about | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
468 anywhere. Since I don't think the obvious copy loop is too |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
469 bad, I'm trying to err in its favor. */ |
314 | 470 if (to - from < 64) |
471 { | |
472 do | |
473 *--endt = *--endf; | |
474 while (endf != from); | |
475 } | |
476 else | |
477 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
478 for (;;) |
314 | 479 { |
480 endt -= (to - from); | |
481 endf -= (to - from); | |
482 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
483 if (endt < to) |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
484 break; |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
485 |
314 | 486 bcopy (endf, endt, to - from); |
487 } | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
488 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
489 /* If SIZE wasn't a multiple of TO - FROM, there will be a |
25012 | 490 little left over. The amount left over is (endt + (to - |
491 from)) - to, which is endt - from. */ | |
314 | 492 bcopy (from, to, endt - from); |
493 } | |
494 } | |
495 } | |
496 | |
25012 | 497 |
498 | |
499 /*********************************************************************** | |
500 Glyph Matrices | |
501 ***********************************************************************/ | |
502 | |
503 /* Allocate and return a glyph_matrix structure. POOL is the glyph | |
504 pool from which memory for the matrix should be allocated, or null | |
505 for window-based redisplay where no glyph pools are used. The | |
506 member `pool' of the glyph matrix structure returned is set to | |
507 POOL, the structure is otherwise zeroed. */ | |
508 | |
509 struct glyph_matrix * | |
510 new_glyph_matrix (pool) | |
511 struct glyph_pool *pool; | |
512 { | |
513 struct glyph_matrix *result; | |
514 | |
515 /* Allocate and clear. */ | |
516 result = (struct glyph_matrix *) xmalloc (sizeof *result); | |
517 bzero (result, sizeof *result); | |
518 | |
519 /* Increment number of allocated matrices. This count is used | |
520 to detect memory leaks. */ | |
521 ++glyph_matrix_count; | |
522 | |
523 /* Set pool and return. */ | |
524 result->pool = pool; | |
525 return result; | |
526 } | |
527 | |
528 | |
529 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed. | |
530 | |
531 The global counter glyph_matrix_count is decremented when a matrix | |
532 is freed. If the count gets negative, more structures were freed | |
533 than allocated, i.e. one matrix was freed more than once or a bogus | |
534 pointer was passed to this function. | |
535 | |
536 If MATRIX->pool is null, this means that the matrix manages its own | |
537 glyph memory---this is done for matrices on X frames. Freeing the | |
538 matrix also frees the glyph memory in this case. */ | |
539 | |
540 static void | |
541 free_glyph_matrix (matrix) | |
542 struct glyph_matrix *matrix; | |
543 { | |
544 if (matrix) | |
545 { | |
546 int i; | |
547 | |
548 /* Detect the case that more matrices are freed than were | |
549 allocated. */ | |
550 if (--glyph_matrix_count < 0) | |
551 abort (); | |
552 | |
553 /* Free glyph memory if MATRIX owns it. */ | |
554 if (matrix->pool == NULL) | |
555 for (i = 0; i < matrix->rows_allocated; ++i) | |
556 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]); | |
557 | |
558 /* Free row structures and the matrix itself. */ | |
559 xfree (matrix->rows); | |
560 xfree (matrix); | |
561 } | |
562 } | |
563 | |
564 | |
565 /* Return the number of glyphs to reserve for a marginal area of | |
566 window W. TOTAL_GLYPHS is the number of glyphs in a complete | |
567 display line of window W. MARGIN gives the width of the marginal | |
568 area in canonical character units. MARGIN should be an integer | |
569 or a float. */ | |
570 | |
571 static int | |
572 margin_glyphs_to_reserve (w, total_glyphs, margin) | |
573 struct window *w; | |
574 int total_glyphs; | |
575 Lisp_Object margin; | |
576 { | |
577 int n; | |
578 | |
579 if (NUMBERP (margin)) | |
580 { | |
581 int width = XFASTINT (w->width); | |
582 double d = max (0, XFLOATINT (margin)); | |
583 d = min (width / 2 - 1, d); | |
584 n = (int) ((double) total_glyphs / width * d); | |
585 } | |
586 else | |
587 n = 0; | |
588 | |
589 return n; | |
590 } | |
591 | |
592 | |
593 /* Adjust glyph matrix MATRIX on window W or on a frame to changed | |
594 window sizes. | |
595 | |
596 W is null if the function is called for a frame glyph matrix. | |
597 Otherwise it is the window MATRIX is a member of. X and Y are the | |
598 indices of the first column and row of MATRIX within the frame | |
599 matrix, if such a matrix exists. They are zero for purely | |
600 window-based redisplay. DIM is the needed size of the matrix. | |
601 | |
602 In window-based redisplay, where no frame matrices exist, glyph | |
603 matrices manage their own glyph storage. Otherwise, they allocate | |
604 storage from a common frame glyph pool which can be found in | |
605 MATRIX->pool. | |
606 | |
607 The reason for this memory management strategy is to avoid complete | |
608 frame redraws if possible. When we allocate from a common pool, a | |
609 change of the location or size of a sub-matrix within the pool | |
610 requires a complete redisplay of the frame because we cannot easily | |
611 make sure that the current matrices of all windows still agree with | |
612 what is displayed on the screen. While this is usually fast, it | |
613 leads to screen flickering. */ | |
614 | |
615 static void | |
616 adjust_glyph_matrix (w, matrix, x, y, dim) | |
617 struct window *w; | |
618 struct glyph_matrix *matrix; | |
619 int x, y; | |
620 struct dim dim; | |
621 { | |
622 int i; | |
623 int new_rows; | |
624 int marginal_areas_changed_p = 0; | |
25546 | 625 int header_line_changed_p = 0; |
626 int header_line_p = 0; | |
25012 | 627 int left = -1, right = -1; |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
628 int window_x, window_y, window_width = -1, window_height; |
25012 | 629 |
630 /* See if W had a top line that has disappeared now, or vice versa. */ | |
631 if (w) | |
632 { | |
25546 | 633 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
634 header_line_changed_p = header_line_p != matrix->header_line_p; | |
25012 | 635 } |
25546 | 636 matrix->header_line_p = header_line_p; |
25012 | 637 |
638 /* Do nothing if MATRIX' size, position, vscroll, and marginal areas | |
639 haven't changed. This optimization is important because preserving | |
640 the matrix means preventing redisplay. */ | |
641 if (matrix->pool == NULL) | |
642 { | |
643 window_box (w, -1, &window_x, &window_y, &window_width, &window_height); | |
644 left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_width); | |
645 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_width); | |
646 xassert (left >= 0 && right >= 0); | |
647 marginal_areas_changed_p = (left != matrix->left_margin_glyphs | |
648 || right != matrix->right_margin_glyphs); | |
649 | |
650 if (!marginal_areas_changed_p | |
651 && !fonts_changed_p | |
25546 | 652 && !header_line_changed_p |
34279
7ab25b4a077c
(adjust_glyph_matrix): Don't reuse a window's current
Gerd Moellmann <gerd@gnu.org>
parents:
34203
diff
changeset
|
653 && matrix->window_left_x == XFASTINT (w->left) |
25012 | 654 && matrix->window_top_y == XFASTINT (w->top) |
655 && matrix->window_height == window_height | |
656 && matrix->window_vscroll == w->vscroll | |
657 && matrix->window_width == window_width) | |
658 return; | |
659 } | |
660 | |
661 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */ | |
662 if (matrix->rows_allocated < dim.height) | |
663 { | |
664 int size = dim.height * sizeof (struct glyph_row); | |
665 new_rows = dim.height - matrix->rows_allocated; | |
666 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size); | |
667 bzero (matrix->rows + matrix->rows_allocated, | |
668 new_rows * sizeof *matrix->rows); | |
669 matrix->rows_allocated = dim.height; | |
670 } | |
671 else | |
672 new_rows = 0; | |
673 | |
674 /* If POOL is not null, MATRIX is a frame matrix or a window matrix | |
675 on a frame not using window-based redisplay. Set up pointers for | |
676 each row into the glyph pool. */ | |
677 if (matrix->pool) | |
678 { | |
679 xassert (matrix->pool->glyphs); | |
680 | |
681 if (w) | |
682 { | |
683 left = margin_glyphs_to_reserve (w, dim.width, | |
684 w->left_margin_width); | |
685 right = margin_glyphs_to_reserve (w, dim.width, | |
686 w->right_margin_width); | |
687 } | |
688 else | |
689 left = right = 0; | |
690 | |
691 for (i = 0; i < dim.height; ++i) | |
692 { | |
693 struct glyph_row *row = &matrix->rows[i]; | |
694 | |
695 row->glyphs[LEFT_MARGIN_AREA] | |
696 = (matrix->pool->glyphs | |
697 + (y + i) * matrix->pool->ncolumns | |
698 + x); | |
699 | |
700 if (w == NULL | |
701 || row == matrix->rows + dim.height - 1 | |
25546 | 702 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 703 { |
704 row->glyphs[TEXT_AREA] | |
705 = row->glyphs[LEFT_MARGIN_AREA]; | |
706 row->glyphs[RIGHT_MARGIN_AREA] | |
707 = row->glyphs[TEXT_AREA] + dim.width; | |
708 row->glyphs[LAST_AREA] | |
709 = row->glyphs[RIGHT_MARGIN_AREA]; | |
710 } | |
711 else | |
712 { | |
713 row->glyphs[TEXT_AREA] | |
714 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
715 row->glyphs[RIGHT_MARGIN_AREA] | |
716 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
717 row->glyphs[LAST_AREA] | |
718 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
719 } | |
720 } | |
721 | |
722 matrix->left_margin_glyphs = left; | |
723 matrix->right_margin_glyphs = right; | |
724 } | |
725 else | |
726 { | |
727 /* If MATRIX->pool is null, MATRIX is responsible for managing | |
728 its own memory. Allocate glyph memory from the heap. */ | |
729 if (dim.width > matrix->matrix_w | |
730 || new_rows | |
25546 | 731 || header_line_changed_p |
25012 | 732 || marginal_areas_changed_p) |
733 { | |
734 struct glyph_row *row = matrix->rows; | |
735 struct glyph_row *end = row + matrix->rows_allocated; | |
736 | |
737 while (row < end) | |
738 { | |
739 row->glyphs[LEFT_MARGIN_AREA] | |
740 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA], | |
741 (dim.width | |
742 * sizeof (struct glyph))); | |
743 | |
744 /* The mode line never has marginal areas. */ | |
745 if (row == matrix->rows + dim.height - 1 | |
25546 | 746 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 747 { |
748 row->glyphs[TEXT_AREA] | |
749 = row->glyphs[LEFT_MARGIN_AREA]; | |
750 row->glyphs[RIGHT_MARGIN_AREA] | |
751 = row->glyphs[TEXT_AREA] + dim.width; | |
752 row->glyphs[LAST_AREA] | |
753 = row->glyphs[RIGHT_MARGIN_AREA]; | |
754 } | |
755 else | |
756 { | |
757 row->glyphs[TEXT_AREA] | |
758 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
759 row->glyphs[RIGHT_MARGIN_AREA] | |
760 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
761 row->glyphs[LAST_AREA] | |
762 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
763 } | |
764 ++row; | |
765 } | |
766 } | |
767 | |
768 xassert (left >= 0 && right >= 0); | |
769 matrix->left_margin_glyphs = left; | |
770 matrix->right_margin_glyphs = right; | |
771 } | |
772 | |
773 /* Number of rows to be used by MATRIX. */ | |
774 matrix->nrows = dim.height; | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
775 xassert (matrix->nrows >= 0); |
25012 | 776 |
777 /* Mark rows in a current matrix of a window as not having valid | |
778 contents. It's important to not do this for desired matrices. | |
779 When Emacs starts, it may already be building desired matrices | |
780 when this function runs. */ | |
781 if (w && matrix == w->current_matrix) | |
782 { | |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
783 if (window_width < 0) |
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
784 window_width = window_box_width (w, -1); |
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
785 |
25012 | 786 /* Optimize the case that only the height has changed (C-x 2, |
787 upper window). Invalidate all rows that are no longer part | |
788 of the window. */ | |
789 if (!marginal_areas_changed_p | |
34279
7ab25b4a077c
(adjust_glyph_matrix): Don't reuse a window's current
Gerd Moellmann <gerd@gnu.org>
parents:
34203
diff
changeset
|
790 && matrix->window_left_x == XFASTINT (w->left) |
25012 | 791 && matrix->window_top_y == XFASTINT (w->top) |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
792 && matrix->window_width == window_box_width (w, -1)) |
25012 | 793 { |
794 i = 0; | |
795 while (matrix->rows[i].enabled_p | |
796 && (MATRIX_ROW_BOTTOM_Y (matrix->rows + i) | |
797 < matrix->window_height)) | |
798 ++i; | |
799 | |
800 /* Window end is invalid, if inside of the rows that | |
801 are invalidated. */ | |
802 if (INTEGERP (w->window_end_vpos) | |
803 && XFASTINT (w->window_end_vpos) >= i) | |
804 w->window_end_valid = Qnil; | |
805 | |
806 while (i < matrix->nrows) | |
807 matrix->rows[i++].enabled_p = 0; | |
808 } | |
809 else | |
810 { | |
811 for (i = 0; i < matrix->nrows; ++i) | |
812 matrix->rows[i].enabled_p = 0; | |
813 } | |
814 } | |
815 | |
816 /* Remember last values to be able to optimize frame redraws. */ | |
817 matrix->matrix_x = x; | |
818 matrix->matrix_y = y; | |
819 matrix->matrix_w = dim.width; | |
820 matrix->matrix_h = dim.height; | |
821 | |
822 /* Record the top y location and height of W at the time the matrix | |
823 was last adjusted. This is used to optimize redisplay above. */ | |
824 if (w) | |
825 { | |
34279
7ab25b4a077c
(adjust_glyph_matrix): Don't reuse a window's current
Gerd Moellmann <gerd@gnu.org>
parents:
34203
diff
changeset
|
826 matrix->window_left_x = XFASTINT (w->left); |
25012 | 827 matrix->window_top_y = XFASTINT (w->top); |
828 matrix->window_height = window_height; | |
829 matrix->window_width = window_width; | |
830 matrix->window_vscroll = w->vscroll; | |
831 } | |
832 } | |
833 | |
834 | |
835 /* Reverse the contents of rows in MATRIX between START and END. The | |
836 contents of the row at END - 1 end up at START, END - 2 at START + | |
837 1 etc. This is part of the implementation of rotate_matrix (see | |
838 below). */ | |
314 | 839 |
840 static void | |
25012 | 841 reverse_rows (matrix, start, end) |
842 struct glyph_matrix *matrix; | |
843 int start, end; | |
314 | 844 { |
25012 | 845 int i, j; |
846 | |
847 for (i = start, j = end - 1; i < j; ++i, --j) | |
848 { | |
849 /* Non-ISO HP/UX compiler doesn't like auto struct | |
850 initialization. */ | |
851 struct glyph_row temp; | |
852 temp = matrix->rows[i]; | |
853 matrix->rows[i] = matrix->rows[j]; | |
854 matrix->rows[j] = temp; | |
855 } | |
314 | 856 } |
857 | |
25012 | 858 |
859 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST - | |
860 1 by BY positions. BY < 0 means rotate left, i.e. towards lower | |
861 indices. (Note: this does not copy glyphs, only glyph pointers in | |
862 row structures are moved around). | |
863 | |
864 The algorithm used for rotating the vector was, I believe, first | |
865 described by Kernighan. See the vector R as consisting of two | |
866 sub-vectors AB, where A has length BY for BY >= 0. The result | |
867 after rotating is then BA. Reverse both sub-vectors to get ArBr | |
868 and reverse the result to get (ArBr)r which is BA. Similar for | |
869 rotating right. */ | |
870 | |
871 void | |
872 rotate_matrix (matrix, first, last, by) | |
873 struct glyph_matrix *matrix; | |
874 int first, last, by; | |
314 | 875 { |
25012 | 876 if (by < 0) |
877 { | |
878 /* Up (rotate left, i.e. towards lower indices). */ | |
879 by = -by; | |
880 reverse_rows (matrix, first, first + by); | |
881 reverse_rows (matrix, first + by, last); | |
882 reverse_rows (matrix, first, last); | |
883 } | |
884 else if (by > 0) | |
314 | 885 { |
25012 | 886 /* Down (rotate right, i.e. towards higher indices). */ |
887 reverse_rows (matrix, last - by, last); | |
888 reverse_rows (matrix, first, last - by); | |
889 reverse_rows (matrix, first, last); | |
314 | 890 } |
25012 | 891 } |
892 | |
893 | |
894 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows | |
895 with indices START <= index < END. Increment positions by DELTA/ | |
896 DELTA_BYTES. */ | |
897 | |
898 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
899 increment_matrix_positions (matrix, start, end, delta, delta_bytes) |
25012 | 900 struct glyph_matrix *matrix; |
901 int start, end, delta, delta_bytes; | |
902 { | |
903 /* Check that START and END are reasonable values. */ | |
904 xassert (start >= 0 && start <= matrix->nrows); | |
905 xassert (end >= 0 && end <= matrix->nrows); | |
906 xassert (start <= end); | |
907 | |
908 for (; start < end; ++start) | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
909 increment_row_positions (matrix->rows + start, delta, delta_bytes); |
25012 | 910 } |
911 | |
912 | |
913 /* Enable a range of rows in glyph matrix MATRIX. START and END are | |
914 the row indices of the first and last + 1 row to enable. If | |
915 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */ | |
916 | |
917 void | |
918 enable_glyph_matrix_rows (matrix, start, end, enabled_p) | |
919 struct glyph_matrix *matrix; | |
920 int start, end; | |
921 int enabled_p; | |
922 { | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
923 xassert (start <= end); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
924 xassert (start >= 0 && start < matrix->nrows); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
925 xassert (end >= 0 && end <= matrix->nrows); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
926 |
25012 | 927 for (; start < end; ++start) |
928 matrix->rows[start].enabled_p = enabled_p != 0; | |
929 } | |
930 | |
931 | |
932 /* Clear MATRIX. | |
933 | |
934 This empties all rows in MATRIX by setting the enabled_p flag for | |
935 all rows of the matrix to zero. The function prepare_desired_row | |
936 will eventually really clear a row when it sees one with a zero | |
937 enabled_p flag. | |
938 | |
939 Resets update hints to defaults value. The only update hint | |
940 currently present is the flag MATRIX->no_scrolling_p. */ | |
941 | |
942 void | |
943 clear_glyph_matrix (matrix) | |
944 struct glyph_matrix *matrix; | |
945 { | |
946 if (matrix) | |
314 | 947 { |
25012 | 948 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0); |
949 matrix->no_scrolling_p = 0; | |
314 | 950 } |
951 } | |
25012 | 952 |
953 | |
954 /* Shift part of the glyph matrix MATRIX of window W up or down. | |
955 Increment y-positions in glyph rows between START and END by DY, | |
956 and recompute their visible height. */ | |
957 | |
958 void | |
959 shift_glyph_matrix (w, matrix, start, end, dy) | |
960 struct window *w; | |
961 struct glyph_matrix *matrix; | |
962 int start, end, dy; | |
963 { | |
964 int min_y, max_y; | |
965 | |
966 xassert (start <= end); | |
967 xassert (start >= 0 && start < matrix->nrows); | |
968 xassert (end >= 0 && end <= matrix->nrows); | |
969 | |
25546 | 970 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 971 max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w); |
972 | |
973 for (; start < end; ++start) | |
974 { | |
975 struct glyph_row *row = &matrix->rows[start]; | |
976 | |
977 row->y += dy; | |
978 | |
979 if (row->y < min_y) | |
980 row->visible_height = row->height - (min_y - row->y); | |
981 else if (row->y + row->height > max_y) | |
982 row->visible_height = row->height - (row->y + row->height - max_y); | |
983 else | |
984 row->visible_height = row->height; | |
985 } | |
986 } | |
987 | |
988 | |
989 /* Mark all rows in current matrices of frame F as invalid. Marking | |
990 invalid is done by setting enabled_p to zero for all rows in a | |
991 current matrix. */ | |
992 | |
993 void | |
994 clear_current_matrices (f) | |
995 register struct frame *f; | |
996 { | |
997 /* Clear frame current matrix, if we have one. */ | |
998 if (f->current_matrix) | |
999 clear_glyph_matrix (f->current_matrix); | |
1000 | |
1001 /* Clear the matrix of the menu bar window, if such a window exists. | |
1002 The menu bar window is currently used to display menus on X when | |
1003 no toolkit support is compiled in. */ | |
1004 if (WINDOWP (f->menu_bar_window)) | |
1005 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix); | |
1006 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1007 /* Clear the matrix of the tool-bar window, if any. */ |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1008 if (WINDOWP (f->tool_bar_window)) |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1009 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |
25012 | 1010 |
1011 /* Clear current window matrices. */ | |
1012 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1013 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0); | |
1014 } | |
1015 | |
1016 | |
1017 /* Clear out all display lines of F for a coming redisplay. */ | |
314 | 1018 |
21514 | 1019 void |
25012 | 1020 clear_desired_matrices (f) |
1021 register struct frame *f; | |
314 | 1022 { |
25012 | 1023 if (f->desired_matrix) |
1024 clear_glyph_matrix (f->desired_matrix); | |
1025 | |
1026 if (WINDOWP (f->menu_bar_window)) | |
1027 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix); | |
1028 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1029 if (WINDOWP (f->tool_bar_window)) |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1030 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix); |
25012 | 1031 |
1032 /* Do it for window matrices. */ | |
1033 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1034 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
1035 } | |
1036 | |
1037 | |
1038 /* Clear matrices in window tree rooted in W. If DESIRED_P is | |
1039 non-zero clear desired matrices, otherwise clear current matrices. */ | |
1040 | |
1041 static void | |
1042 clear_window_matrices (w, desired_p) | |
1043 struct window *w; | |
1044 int desired_p; | |
1045 { | |
1046 while (w) | |
314 | 1047 { |
25012 | 1048 if (!NILP (w->hchild)) |
1049 { | |
1050 xassert (WINDOWP (w->hchild)); | |
1051 clear_window_matrices (XWINDOW (w->hchild), desired_p); | |
1052 } | |
1053 else if (!NILP (w->vchild)) | |
314 | 1054 { |
25012 | 1055 xassert (WINDOWP (w->vchild)); |
1056 clear_window_matrices (XWINDOW (w->vchild), desired_p); | |
1057 } | |
1058 else | |
1059 { | |
1060 if (desired_p) | |
1061 clear_glyph_matrix (w->desired_matrix); | |
1062 else | |
314 | 1063 { |
25012 | 1064 clear_glyph_matrix (w->current_matrix); |
1065 w->window_end_valid = Qnil; | |
314 | 1066 } |
25012 | 1067 } |
1068 | |
1069 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
1070 } | |
1071 } | |
1072 | |
1073 | |
1074 | |
1075 /*********************************************************************** | |
1076 Glyph Rows | |
1077 | |
1078 See dispextern.h for an overall explanation of glyph rows. | |
1079 ***********************************************************************/ | |
1080 | |
1081 /* Clear glyph row ROW. Do it in a way that makes it robust against | |
1082 changes in the glyph_row structure, i.e. addition or removal of | |
1083 structure members. */ | |
1084 | |
33527
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1085 static struct glyph_row null_row; |
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1086 |
25012 | 1087 void |
1088 clear_glyph_row (row) | |
1089 struct glyph_row *row; | |
1090 { | |
1091 struct glyph *p[1 + LAST_AREA]; | |
1092 | |
1093 /* Save pointers. */ | |
1094 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA]; | |
1095 p[TEXT_AREA] = row->glyphs[TEXT_AREA]; | |
1096 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA]; | |
1097 p[LAST_AREA] = row->glyphs[LAST_AREA]; | |
1098 | |
1099 /* Clear. */ | |
1100 *row = null_row; | |
1101 | |
1102 /* Restore pointers. */ | |
1103 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA]; | |
1104 row->glyphs[TEXT_AREA] = p[TEXT_AREA]; | |
1105 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA]; | |
1106 row->glyphs[LAST_AREA] = p[LAST_AREA]; | |
30041
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1107 |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1108 #if 0 /* At some point, some bit-fields of struct glyph were not set, |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1109 which made glyphs unequal when compared with GLYPH_EQUAL_P. |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1110 Redisplay outputs such glyphs, and flickering effects were |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1111 the result. This also depended on the contents of memory |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1112 returned by xmalloc. If flickering happens again, activate |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1113 the code below If the flickering is gone with that, chances |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1114 are that the flickering has the same reason as here. */ |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1115 bzero (p[0], (char *) p[LAST_AREA] - (char *) p[0]); |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1116 #endif |
25012 | 1117 } |
1118 | |
1119 | |
1120 /* Make ROW an empty, enabled row of canonical character height, | |
1121 in window W starting at y-position Y. */ | |
1122 | |
1123 void | |
1124 blank_row (w, row, y) | |
1125 struct window *w; | |
1126 struct glyph_row *row; | |
1127 int y; | |
1128 { | |
1129 int min_y, max_y; | |
1130 | |
25546 | 1131 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 1132 max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w); |
1133 | |
1134 clear_glyph_row (row); | |
1135 row->y = y; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1136 row->ascent = row->phys_ascent = 0; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1137 row->height = row->phys_height = CANON_Y_UNIT (XFRAME (w->frame)); |
25012 | 1138 |
1139 if (row->y < min_y) | |
1140 row->visible_height = row->height - (min_y - row->y); | |
1141 else if (row->y + row->height > max_y) | |
1142 row->visible_height = row->height - (row->y + row->height - max_y); | |
1143 else | |
1144 row->visible_height = row->height; | |
1145 | |
1146 row->enabled_p = 1; | |
1147 } | |
1148 | |
1149 | |
1150 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES | |
1151 are the amounts by which to change positions. Note that the first | |
1152 glyph of the text area of a row can have a buffer position even if | |
1153 the used count of the text area is zero. Such rows display line | |
1154 ends. */ | |
1155 | |
1156 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1157 increment_row_positions (row, delta, delta_bytes) |
25012 | 1158 struct glyph_row *row; |
1159 int delta, delta_bytes; | |
1160 { | |
1161 int area, i; | |
1162 | |
1163 /* Increment start and end positions. */ | |
1164 MATRIX_ROW_START_CHARPOS (row) += delta; | |
1165 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes; | |
1166 MATRIX_ROW_END_CHARPOS (row) += delta; | |
1167 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes; | |
1168 | |
1169 /* Increment positions in glyphs. */ | |
1170 for (area = 0; area < LAST_AREA; ++area) | |
1171 for (i = 0; i < row->used[area]; ++i) | |
1172 if (BUFFERP (row->glyphs[area][i].object) | |
1173 && row->glyphs[area][i].charpos > 0) | |
1174 row->glyphs[area][i].charpos += delta; | |
1175 | |
1176 /* Capture the case of rows displaying a line end. */ | |
1177 if (row->used[TEXT_AREA] == 0 | |
1178 && MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1179 row->glyphs[TEXT_AREA]->charpos += delta; | |
1180 } | |
1181 | |
1182 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1183 #if 0 |
25012 | 1184 /* Swap glyphs between two glyph rows A and B. This exchanges glyph |
1185 contents, i.e. glyph structure contents are exchanged between A and | |
1186 B without changing glyph pointers in A and B. */ | |
1187 | |
1188 static void | |
1189 swap_glyphs_in_rows (a, b) | |
1190 struct glyph_row *a, *b; | |
1191 { | |
1192 int area; | |
1193 | |
1194 for (area = 0; area < LAST_AREA; ++area) | |
1195 { | |
1196 /* Number of glyphs to swap. */ | |
1197 int max_used = max (a->used[area], b->used[area]); | |
1198 | |
1199 /* Start of glyphs in area of row A. */ | |
1200 struct glyph *glyph_a = a->glyphs[area]; | |
1201 | |
1202 /* End + 1 of glyphs in area of row A. */ | |
1203 struct glyph *glyph_a_end = a->glyphs[max_used]; | |
1204 | |
1205 /* Start of glyphs in area of row B. */ | |
1206 struct glyph *glyph_b = b->glyphs[area]; | |
1207 | |
1208 while (glyph_a < glyph_a_end) | |
1209 { | |
1210 /* Non-ISO HP/UX compiler doesn't like auto struct | |
1211 initialization. */ | |
1212 struct glyph temp; | |
1213 temp = *glyph_a; | |
1214 *glyph_a = *glyph_b; | |
1215 *glyph_b = temp; | |
1216 ++glyph_a; | |
1217 ++glyph_b; | |
314 | 1218 } |
1219 } | |
1220 } | |
25012 | 1221 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1222 #endif /* 0 */ |
25012 | 1223 |
1224 /* Exchange pointers to glyph memory between glyph rows A and B. */ | |
1225 | |
1226 static INLINE void | |
1227 swap_glyph_pointers (a, b) | |
1228 struct glyph_row *a, *b; | |
1229 { | |
1230 int i; | |
1231 for (i = 0; i < LAST_AREA + 1; ++i) | |
1232 { | |
1233 struct glyph *temp = a->glyphs[i]; | |
1234 a->glyphs[i] = b->glyphs[i]; | |
1235 b->glyphs[i] = temp; | |
1236 } | |
1237 } | |
1238 | |
1239 | |
1240 /* Copy glyph row structure FROM to glyph row structure TO, except | |
1241 that glyph pointers in the structures are left unchanged. */ | |
1242 | |
1243 INLINE void | |
1244 copy_row_except_pointers (to, from) | |
1245 struct glyph_row *to, *from; | |
1246 { | |
1247 struct glyph *pointers[1 + LAST_AREA]; | |
1248 | |
1249 /* Save glyph pointers of TO. */ | |
1250 bcopy (to->glyphs, pointers, sizeof to->glyphs); | |
1251 | |
1252 /* Do a structure assignment. */ | |
1253 *to = *from; | |
1254 | |
1255 /* Restore original pointers of TO. */ | |
1256 bcopy (pointers, to->glyphs, sizeof to->glyphs); | |
1257 } | |
1258 | |
1259 | |
1260 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in | |
1261 TO and FROM are left unchanged. Glyph contents are copied from the | |
1262 glyph memory of FROM to the glyph memory of TO. Increment buffer | |
1263 positions in row TO by DELTA/ DELTA_BYTES. */ | |
1264 | |
1265 void | |
1266 copy_glyph_row_contents (to, from, delta, delta_bytes) | |
1267 struct glyph_row *to, *from; | |
1268 int delta, delta_bytes; | |
1269 { | |
1270 int area; | |
1271 | |
1272 /* This is like a structure assignment TO = FROM, except that | |
1273 glyph pointers in the rows are left unchanged. */ | |
1274 copy_row_except_pointers (to, from); | |
1275 | |
1276 /* Copy glyphs from FROM to TO. */ | |
1277 for (area = 0; area < LAST_AREA; ++area) | |
1278 if (from->used[area]) | |
1279 bcopy (from->glyphs[area], to->glyphs[area], | |
1280 from->used[area] * sizeof (struct glyph)); | |
1281 | |
1282 /* Increment buffer positions in TO by DELTA. */ | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1283 increment_row_positions (to, delta, delta_bytes); |
25012 | 1284 } |
1285 | |
1286 | |
1287 /* Assign glyph row FROM to glyph row TO. This works like a structure | |
1288 assignment TO = FROM, except that glyph pointers are not copied but | |
1289 exchanged between TO and FROM. Pointers must be exchanged to avoid | |
1290 a memory leak. */ | |
1291 | |
1292 static INLINE void | |
1293 assign_row (to, from) | |
1294 struct glyph_row *to, *from; | |
1295 { | |
1296 swap_glyph_pointers (to, from); | |
1297 copy_row_except_pointers (to, from); | |
1298 } | |
1299 | |
1300 | |
1301 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is | |
1302 a row in a window matrix, is a slice of the glyph memory of the | |
1303 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value | |
1304 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph | |
1305 memory of FRAME_ROW. */ | |
1306 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
1307 #if GLYPH_DEBUG |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1308 |
25012 | 1309 static int |
1310 glyph_row_slice_p (window_row, frame_row) | |
1311 struct glyph_row *window_row, *frame_row; | |
1312 { | |
1313 struct glyph *window_glyph_start = window_row->glyphs[0]; | |
1314 struct glyph *frame_glyph_start = frame_row->glyphs[0]; | |
1315 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA]; | |
1316 | |
1317 return (frame_glyph_start <= window_glyph_start | |
1318 && window_glyph_start < frame_glyph_end); | |
1319 } | |
1320 | |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1321 #endif /* GLYPH_DEBUG */ |
25012 | 1322 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1323 #if 0 |
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1324 |
25012 | 1325 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice |
1326 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row | |
1327 in WINDOW_MATRIX is found satisfying the condition. */ | |
1328 | |
1329 static struct glyph_row * | |
1330 find_glyph_row_slice (window_matrix, frame_matrix, row) | |
1331 struct glyph_matrix *window_matrix, *frame_matrix; | |
1332 int row; | |
1333 { | |
1334 int i; | |
1335 | |
1336 xassert (row >= 0 && row < frame_matrix->nrows); | |
1337 | |
1338 for (i = 0; i < window_matrix->nrows; ++i) | |
1339 if (glyph_row_slice_p (window_matrix->rows + i, | |
1340 frame_matrix->rows + row)) | |
1341 break; | |
1342 | |
1343 return i < window_matrix->nrows ? window_matrix->rows + i : 0; | |
1344 } | |
1345 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1346 #endif /* 0 */ |
25012 | 1347 |
1348 /* Prepare ROW for display. Desired rows are cleared lazily, | |
1349 i.e. they are only marked as to be cleared by setting their | |
1350 enabled_p flag to zero. When a row is to be displayed, a prior | |
1351 call to this function really clears it. */ | |
1352 | |
1353 void | |
1354 prepare_desired_row (row) | |
1355 struct glyph_row *row; | |
1356 { | |
1357 if (!row->enabled_p) | |
1358 { | |
1359 clear_glyph_row (row); | |
1360 row->enabled_p = 1; | |
1361 } | |
1362 } | |
1363 | |
1364 | |
1365 /* Return a hash code for glyph row ROW. */ | |
1366 | |
1367 int | |
1368 line_hash_code (row) | |
1369 struct glyph_row *row; | |
1370 { | |
1371 int hash = 0; | |
1372 | |
1373 if (row->enabled_p) | |
1374 { | |
1375 if (row->inverse_p) | |
1376 { | |
1377 /* Give all highlighted lines the same hash code | |
1378 so as to encourage scrolling to leave them in place. */ | |
1379 hash = -1; | |
1380 } | |
1381 else | |
1382 { | |
1383 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
1384 struct glyph *end = glyph + row->used[TEXT_AREA]; | |
1385 | |
1386 while (glyph < end) | |
1387 { | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1388 int c = glyph->u.ch; |
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1389 int face_id = glyph->face_id; |
25012 | 1390 if (must_write_spaces) |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1391 c -= SPACEGLYPH; |
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1392 hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + c; |
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1393 hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + face_id; |
25012 | 1394 ++glyph; |
1395 } | |
1396 | |
1397 if (hash == 0) | |
1398 hash = 1; | |
1399 } | |
1400 } | |
1401 | |
1402 return hash; | |
1403 } | |
1404 | |
1405 | |
1406 /* Return the cost of drawing line VPOS In MATRIX. The cost equals | |
1407 the number of characters in the line. If must_write_spaces is | |
1408 zero, leading and trailing spaces are ignored. */ | |
1409 | |
1410 static unsigned int | |
1411 line_draw_cost (matrix, vpos) | |
1412 struct glyph_matrix *matrix; | |
1413 int vpos; | |
1414 { | |
1415 struct glyph_row *row = matrix->rows + vpos; | |
1416 struct glyph *beg = row->glyphs[TEXT_AREA]; | |
1417 struct glyph *end = beg + row->used[TEXT_AREA]; | |
1418 int len; | |
1419 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE; | |
1420 int glyph_table_len = GLYPH_TABLE_LENGTH; | |
1421 | |
1422 /* Ignore trailing and leading spaces if we can. */ | |
1423 if (!must_write_spaces) | |
1424 { | |
1425 /* Skip from the end over trailing spaces. */ | |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
1426 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1))) |
25012 | 1427 --end; |
1428 | |
1429 /* All blank line. */ | |
1430 if (end == beg) | |
1431 return 0; | |
1432 | |
1433 /* Skip over leading spaces. */ | |
1434 while (CHAR_GLYPH_SPACE_P (*beg)) | |
1435 ++beg; | |
1436 } | |
1437 | |
1438 /* If we don't have a glyph-table, each glyph is one character, | |
1439 so return the number of glyphs. */ | |
1440 if (glyph_table_base == 0) | |
1441 len = end - beg; | |
1442 else | |
1443 { | |
1444 /* Otherwise, scan the glyphs and accumulate their total length | |
1445 in LEN. */ | |
1446 len = 0; | |
1447 while (beg < end) | |
1448 { | |
1449 GLYPH g = GLYPH_FROM_CHAR_GLYPH (*beg); | |
1450 | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1451 if (g < 0 |
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1452 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g)) |
25012 | 1453 len += 1; |
1454 else | |
1455 len += GLYPH_LENGTH (glyph_table_base, g); | |
1456 | |
1457 ++beg; | |
1458 } | |
1459 } | |
1460 | |
1461 return len; | |
1462 } | |
1463 | |
1464 | |
1465 /* Test two glyph rows A and B for equality. Value is non-zero if A | |
1466 and B have equal contents. W is the window to which the glyphs | |
1467 rows A and B belong. It is needed here to test for partial row | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1468 visibility. MOUSE_FACE_P non-zero means compare the mouse_face_p |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1469 flags of A and B, too. */ |
25012 | 1470 |
1471 static INLINE int | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1472 row_equal_p (w, a, b, mouse_face_p) |
25012 | 1473 struct window *w; |
1474 struct glyph_row *a, *b; | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1475 int mouse_face_p; |
25012 | 1476 { |
1477 if (a == b) | |
1478 return 1; | |
1479 else if (a->hash != b->hash) | |
1480 return 0; | |
1481 else | |
1482 { | |
1483 struct glyph *a_glyph, *b_glyph, *a_end; | |
1484 int area; | |
1485 | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1486 if (mouse_face_p && a->mouse_face_p != b->mouse_face_p) |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1487 return 0; |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1488 |
25012 | 1489 /* Compare glyphs. */ |
1490 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
1491 { | |
1492 if (a->used[area] != b->used[area]) | |
1493 return 0; | |
1494 | |
1495 a_glyph = a->glyphs[area]; | |
1496 a_end = a_glyph + a->used[area]; | |
1497 b_glyph = b->glyphs[area]; | |
1498 | |
1499 while (a_glyph < a_end | |
1500 && GLYPH_EQUAL_P (a_glyph, b_glyph)) | |
1501 ++a_glyph, ++b_glyph; | |
1502 | |
1503 if (a_glyph != a_end) | |
1504 return 0; | |
1505 } | |
1506 | |
1507 if (a->truncated_on_left_p != b->truncated_on_left_p | |
1508 || a->inverse_p != b->inverse_p | |
1509 || a->fill_line_p != b->fill_line_p | |
1510 || a->truncated_on_right_p != b->truncated_on_right_p | |
1511 || a->overlay_arrow_p != b->overlay_arrow_p | |
1512 || a->continued_p != b->continued_p | |
1513 || a->indicate_empty_line_p != b->indicate_empty_line_p | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1514 || a->overlapped_p != b->overlapped_p |
25012 | 1515 || (MATRIX_ROW_CONTINUATION_LINE_P (a) |
1516 != MATRIX_ROW_CONTINUATION_LINE_P (b)) | |
1517 /* Different partially visible characters on left margin. */ | |
1518 || a->x != b->x | |
1519 /* Different height. */ | |
1520 || a->ascent != b->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1521 || a->phys_ascent != b->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1522 || a->phys_height != b->phys_height |
25012 | 1523 || a->visible_height != b->visible_height) |
1524 return 0; | |
1525 } | |
1526 | |
1527 return 1; | |
1528 } | |
1529 | |
1530 | |
314 | 1531 |
25012 | 1532 /*********************************************************************** |
1533 Glyph Pool | |
1534 | |
1535 See dispextern.h for an overall explanation of glyph pools. | |
1536 ***********************************************************************/ | |
1537 | |
1538 /* Allocate a glyph_pool structure. The structure returned is | |
1539 initialized with zeros. The global variable glyph_pool_count is | |
1540 incremented for each pool allocated. */ | |
1541 | |
1542 static struct glyph_pool * | |
1543 new_glyph_pool () | |
1544 { | |
1545 struct glyph_pool *result; | |
1546 | |
1547 /* Allocate a new glyph_pool and clear it. */ | |
1548 result = (struct glyph_pool *) xmalloc (sizeof *result); | |
1549 bzero (result, sizeof *result); | |
1550 | |
1551 /* For memory leak and double deletion checking. */ | |
1552 ++glyph_pool_count; | |
1553 | |
1554 return result; | |
1555 } | |
1556 | |
1557 | |
1558 /* Free a glyph_pool structure POOL. The function may be called with | |
1559 a null POOL pointer. The global variable glyph_pool_count is | |
1560 decremented with every pool structure freed. If this count gets | |
1561 negative, more structures were freed than allocated, i.e. one | |
1562 structure must have been freed more than once or a bogus pointer | |
1563 was passed to free_glyph_pool. */ | |
1564 | |
1565 static void | |
1566 free_glyph_pool (pool) | |
1567 struct glyph_pool *pool; | |
1568 { | |
1569 if (pool) | |
1570 { | |
1571 /* More freed than allocated? */ | |
1572 --glyph_pool_count; | |
1573 xassert (glyph_pool_count >= 0); | |
1574 | |
1575 xfree (pool->glyphs); | |
1576 xfree (pool); | |
1577 } | |
1578 } | |
1579 | |
1580 | |
1581 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and | |
1582 columns we need. This function never shrinks a pool. The only | |
1583 case in which this would make sense, would be when a frame's size | |
1584 is changed from a large value to a smaller one. But, if someone | |
1585 does it once, we can expect that he will do it again. | |
1586 | |
1587 Value is non-zero if the pool changed in a way which makes | |
1588 re-adjusting window glyph matrices necessary. */ | |
1589 | |
1590 static int | |
1591 realloc_glyph_pool (pool, matrix_dim) | |
1592 struct glyph_pool *pool; | |
1593 struct dim matrix_dim; | |
1594 { | |
1595 int needed; | |
1596 int changed_p; | |
1597 | |
1598 changed_p = (pool->glyphs == 0 | |
1599 || matrix_dim.height != pool->nrows | |
1600 || matrix_dim.width != pool->ncolumns); | |
1601 | |
1602 /* Enlarge the glyph pool. */ | |
1603 needed = matrix_dim.width * matrix_dim.height; | |
1604 if (needed > pool->nglyphs) | |
1605 { | |
1606 int size = needed * sizeof (struct glyph); | |
1607 | |
1608 if (pool->glyphs) | |
1609 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size); | |
1610 else | |
1611 { | |
1612 pool->glyphs = (struct glyph *) xmalloc (size); | |
1613 bzero (pool->glyphs, size); | |
1614 } | |
1615 | |
1616 pool->nglyphs = needed; | |
1617 } | |
1618 | |
1619 /* Remember the number of rows and columns because (a) we use then | |
1620 to do sanity checks, and (b) the number of columns determines | |
1621 where rows in the frame matrix start---this must be available to | |
1622 determine pointers to rows of window sub-matrices. */ | |
1623 pool->nrows = matrix_dim.height; | |
1624 pool->ncolumns = matrix_dim.width; | |
1625 | |
1626 return changed_p; | |
1627 } | |
1628 | |
1629 | |
1630 | |
1631 /*********************************************************************** | |
1632 Debug Code | |
1633 ***********************************************************************/ | |
1634 | |
1635 #if GLYPH_DEBUG | |
1636 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1637 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1638 /* Flush standard output. This is sometimes useful to call from |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1639 the debugger. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1640 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1641 void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1642 flush_stdout () |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1643 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1644 fflush (stdout); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1645 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1646 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1647 |
25012 | 1648 /* Check that no glyph pointers have been lost in MATRIX. If a |
1649 pointer has been lost, e.g. by using a structure assignment between | |
1650 rows, at least one pointer must occur more than once in the rows of | |
1651 MATRIX. */ | |
1652 | |
1653 void | |
1654 check_matrix_pointer_lossage (matrix) | |
1655 struct glyph_matrix *matrix; | |
1656 { | |
1657 int i, j; | |
1658 | |
1659 for (i = 0; i < matrix->nrows; ++i) | |
1660 for (j = 0; j < matrix->nrows; ++j) | |
1661 xassert (i == j | |
1662 || (matrix->rows[i].glyphs[TEXT_AREA] | |
1663 != matrix->rows[j].glyphs[TEXT_AREA])); | |
1664 } | |
1665 | |
1666 | |
1667 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */ | |
1668 | |
1669 struct glyph_row * | |
1670 matrix_row (matrix, row) | |
1671 struct glyph_matrix *matrix; | |
1672 int row; | |
1673 { | |
1674 xassert (matrix && matrix->rows); | |
1675 xassert (row >= 0 && row < matrix->nrows); | |
1676 | |
1677 /* That's really too slow for normal testing because this function | |
1678 is called almost everywhere. Although---it's still astonishingly | |
1679 fast, so it is valuable to have for debugging purposes. */ | |
314 | 1680 #if 0 |
25012 | 1681 check_matrix_pointer_lossage (matrix); |
1682 #endif | |
1683 | |
1684 return matrix->rows + row; | |
1685 } | |
1686 | |
1687 | |
1688 #if 0 /* This function makes invalid assumptions when text is | |
1689 partially invisible. But it might come handy for debugging | |
1690 nevertheless. */ | |
1691 | |
1692 /* Check invariants that must hold for an up to date current matrix of | |
1693 window W. */ | |
1694 | |
1695 static void | |
1696 check_matrix_invariants (w) | |
314 | 1697 struct window *w; |
1698 { | |
25012 | 1699 struct glyph_matrix *matrix = w->current_matrix; |
1700 int yb = window_text_bottom_y (w); | |
1701 struct glyph_row *row = matrix->rows; | |
1702 struct glyph_row *last_text_row = NULL; | |
1703 struct buffer *saved = current_buffer; | |
1704 struct buffer *buffer = XBUFFER (w->buffer); | |
1705 int c; | |
1706 | |
1707 /* This can sometimes happen for a fresh window. */ | |
1708 if (matrix->nrows < 2) | |
1709 return; | |
1710 | |
1711 set_buffer_temp (buffer); | |
1712 | |
1713 /* Note: last row is always reserved for the mode line. */ | |
1714 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1715 && MATRIX_ROW_BOTTOM_Y (row) < yb) | |
1716 { | |
1717 struct glyph_row *next = row + 1; | |
1718 | |
1719 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1720 last_text_row = row; | |
1721 | |
1722 /* Check that character and byte positions are in sync. */ | |
1723 xassert (MATRIX_ROW_START_BYTEPOS (row) | |
1724 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row))); | |
1725 | |
1726 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can | |
1727 have such a position temporarily in case of a minibuffer | |
1728 displaying something like `[Sole completion]' at its end. */ | |
1729 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer)) | |
1730 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1731 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row))); | |
1732 | |
1733 /* Check that end position of `row' is equal to start position | |
1734 of next row. */ | |
1735 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next)) | |
1736 { | |
1737 xassert (MATRIX_ROW_END_CHARPOS (row) | |
1738 == MATRIX_ROW_START_CHARPOS (next)); | |
1739 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1740 == MATRIX_ROW_START_BYTEPOS (next)); | |
1741 } | |
1742 row = next; | |
1743 } | |
1744 | |
1745 xassert (w->current_matrix->nrows == w->desired_matrix->nrows); | |
1746 xassert (w->desired_matrix->rows != NULL); | |
1747 set_buffer_temp (saved); | |
1748 } | |
1749 | |
1750 #endif /* 0 */ | |
1751 | |
1752 #endif /* GLYPH_DEBUG != 0 */ | |
1753 | |
1754 | |
1755 | |
1756 /********************************************************************** | |
1757 Allocating/ Adjusting Glyph Matrices | |
1758 **********************************************************************/ | |
1759 | |
1760 /* Allocate glyph matrices over a window tree for a frame-based | |
1761 redisplay | |
1762 | |
1763 X and Y are column/row within the frame glyph matrix where | |
1764 sub-matrices for the window tree rooted at WINDOW must be | |
1765 allocated. CH_DIM contains the dimensions of the smallest | |
1766 character that could be used during display. DIM_ONLY_P non-zero | |
1767 means that the caller of this function is only interested in the | |
1768 result matrix dimension, and matrix adjustments should not be | |
1769 performed. | |
1770 | |
1771 The function returns the total width/height of the sub-matrices of | |
1772 the window tree. If called on a frame root window, the computation | |
1773 will take the mini-buffer window into account. | |
1774 | |
1775 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits | |
1776 | |
1777 NEW_LEAF_MATRIX set if any window in the tree did not have a | |
1778 glyph matrices yet, and | |
1779 | |
1780 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of | |
1781 any window in the tree will be changed or have been changed (see | |
1782 DIM_ONLY_P). | |
1783 | |
1784 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this | |
1785 function. | |
1786 | |
1787 Windows are arranged into chains of windows on the same level | |
1788 through the next fields of window structures. Such a level can be | |
1789 either a sequence of horizontally adjacent windows from left to | |
1790 right, or a sequence of vertically adjacent windows from top to | |
1791 bottom. Each window in a horizontal sequence can be either a leaf | |
1792 window or a vertical sequence; a window in a vertical sequence can | |
1793 be either a leaf or a horizontal sequence. All windows in a | |
1794 horizontal sequence have the same height, and all windows in a | |
1795 vertical sequence have the same width. | |
1796 | |
1797 This function uses, for historical reasons, a more general | |
1798 algorithm to determine glyph matrix dimensions that would be | |
1799 necessary. | |
1800 | |
1801 The matrix height of a horizontal sequence is determined by the | |
1802 maximum height of any matrix in the sequence. The matrix width of | |
1803 a horizontal sequence is computed by adding up matrix widths of | |
1804 windows in the sequence. | |
1805 | |
1806 |<------- result width ------->| | |
1807 +---------+----------+---------+ --- | |
1808 | | | | | | |
1809 | | | | | |
1810 +---------+ | | result height | |
1811 | +---------+ | |
1812 | | | | |
1813 +----------+ --- | |
1814 | |
1815 The matrix width of a vertical sequence is the maximum matrix width | |
1816 of any window in the sequence. Its height is computed by adding up | |
1817 matrix heights of windows in the sequence. | |
1818 | |
1819 |<---- result width -->| | |
1820 +---------+ --- | |
1821 | | | | |
1822 | | | | |
1823 +---------+--+ | | |
1824 | | | | |
1825 | | result height | |
1826 | | | |
1827 +------------+---------+ | | |
1828 | | | | |
1829 | | | | |
1830 +------------+---------+ --- */ | |
1831 | |
1832 /* Bit indicating that a new matrix will be allocated or has been | |
1833 allocated. */ | |
1834 | |
1835 #define NEW_LEAF_MATRIX (1 << 0) | |
1836 | |
1837 /* Bit indicating that a matrix will or has changed its location or | |
1838 size. */ | |
1839 | |
1840 #define CHANGED_LEAF_MATRIX (1 << 1) | |
1841 | |
1842 static struct dim | |
1843 allocate_matrices_for_frame_redisplay (window, x, y, ch_dim, | |
1844 dim_only_p, window_change_flags) | |
1845 Lisp_Object window; | |
1846 int x, y; | |
1847 struct dim ch_dim; | |
1848 int dim_only_p; | |
1849 int *window_change_flags; | |
1850 { | |
1851 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | |
1852 int x0 = x, y0 = y; | |
1853 int wmax = 0, hmax = 0; | |
1854 struct dim total; | |
1855 struct dim dim; | |
1856 struct window *w; | |
1857 int in_horz_combination_p; | |
1858 | |
1859 /* What combination is WINDOW part of? Compute this once since the | |
1860 result is the same for all windows in the `next' chain. The | |
1861 special case of a root window (parent equal to nil) is treated | |
1862 like a vertical combination because a root window's `next' | |
1863 points to the mini-buffer window, if any, which is arranged | |
1864 vertically below other windows. */ | |
1865 in_horz_combination_p | |
1866 = (!NILP (XWINDOW (window)->parent) | |
1867 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild)); | |
1868 | |
1869 /* For WINDOW and all windows on the same level. */ | |
1870 do | |
1871 { | |
1872 w = XWINDOW (window); | |
1873 | |
1874 /* Get the dimension of the window sub-matrix for W, depending | |
1875 on whether this a combination or a leaf window. */ | |
1876 if (!NILP (w->hchild)) | |
1877 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, ch_dim, | |
1878 dim_only_p, | |
1879 window_change_flags); | |
1880 else if (!NILP (w->vchild)) | |
1881 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, ch_dim, | |
1882 dim_only_p, | |
1883 window_change_flags); | |
1884 else | |
1885 { | |
1886 /* If not already done, allocate sub-matrix structures. */ | |
1887 if (w->desired_matrix == NULL) | |
1888 { | |
1889 w->desired_matrix = new_glyph_matrix (f->desired_pool); | |
1890 w->current_matrix = new_glyph_matrix (f->current_pool); | |
1891 *window_change_flags |= NEW_LEAF_MATRIX; | |
1892 } | |
1893 | |
1894 /* Width and height MUST be chosen so that there are no | |
1895 holes in the frame matrix. */ | |
28507
b6f06a755c7d
make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents:
28361
diff
changeset
|
1896 dim.width = XINT (w->width); |
b6f06a755c7d
make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents:
28361
diff
changeset
|
1897 dim.height = XINT (w->height); |
25012 | 1898 |
1899 /* Will matrix be re-allocated? */ | |
1900 if (x != w->desired_matrix->matrix_x | |
1901 || y != w->desired_matrix->matrix_y | |
1902 || dim.width != w->desired_matrix->matrix_w | |
1903 || dim.height != w->desired_matrix->matrix_h | |
1904 || (margin_glyphs_to_reserve (w, dim.width, | |
1905 w->right_margin_width) | |
1906 != w->desired_matrix->left_margin_glyphs) | |
1907 || (margin_glyphs_to_reserve (w, dim.width, | |
1908 w->left_margin_width) | |
1909 != w->desired_matrix->right_margin_glyphs)) | |
1910 *window_change_flags |= CHANGED_LEAF_MATRIX; | |
1911 | |
1912 /* Actually change matrices, if allowed. Do not consider | |
1913 CHANGED_LEAF_MATRIX computed above here because the pool | |
1914 may have been changed which we don't now here. We trust | |
1915 that we only will be called with DIM_ONLY_P != 0 when | |
1916 necessary. */ | |
1917 if (!dim_only_p) | |
1918 { | |
1919 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim); | |
1920 adjust_glyph_matrix (w, w->current_matrix, x, y, dim); | |
1921 } | |
1922 } | |
1923 | |
1924 /* If we are part of a horizontal combination, advance x for | |
1925 windows to the right of W; otherwise advance y for windows | |
1926 below W. */ | |
1927 if (in_horz_combination_p) | |
1928 x += dim.width; | |
1929 else | |
1930 y += dim.height; | |
1931 | |
1932 /* Remember maximum glyph matrix dimensions. */ | |
1933 wmax = max (wmax, dim.width); | |
1934 hmax = max (hmax, dim.height); | |
1935 | |
1936 /* Next window on same level. */ | |
1937 window = w->next; | |
1938 } | |
1939 while (!NILP (window)); | |
1940 | |
1941 /* Set `total' to the total glyph matrix dimension of this window | |
1942 level. In a vertical combination, the width is the width of the | |
1943 widest window; the height is the y we finally reached, corrected | |
1944 by the y we started with. In a horizontal combination, the total | |
1945 height is the height of the tallest window, and the width is the | |
1946 x we finally reached, corrected by the x we started with. */ | |
1947 if (in_horz_combination_p) | |
1948 { | |
1949 total.width = x - x0; | |
1950 total.height = hmax; | |
1951 } | |
1952 else | |
1953 { | |
1954 total.width = wmax; | |
1955 total.height = y - y0; | |
1956 } | |
1957 | |
1958 return total; | |
1959 } | |
1960 | |
1961 | |
1962 /* Allocate window matrices for window-based redisplay. W is the | |
1963 window whose matrices must be allocated/reallocated. CH_DIM is the | |
1964 size of the smallest character that could potentially be used on W. */ | |
1965 | |
1966 static void | |
1967 allocate_matrices_for_window_redisplay (w, ch_dim) | |
1968 struct window *w; | |
1969 struct dim ch_dim; | |
1970 { | |
1971 struct frame *f = XFRAME (w->frame); | |
1972 | |
1973 while (w) | |
314 | 1974 { |
25012 | 1975 if (!NILP (w->vchild)) |
1976 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild), ch_dim); | |
1977 else if (!NILP (w->hchild)) | |
1978 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild), ch_dim); | |
1979 else | |
314 | 1980 { |
25012 | 1981 /* W is a leaf window. */ |
1982 int window_pixel_width = XFLOATINT (w->width) * CANON_X_UNIT (f); | |
1983 int window_pixel_height = window_box_height (w) + abs (w->vscroll); | |
1984 struct dim dim; | |
1985 | |
1986 /* If matrices are not yet allocated, allocate them now. */ | |
1987 if (w->desired_matrix == NULL) | |
314 | 1988 { |
25012 | 1989 w->desired_matrix = new_glyph_matrix (NULL); |
1990 w->current_matrix = new_glyph_matrix (NULL); | |
314 | 1991 } |
25012 | 1992 |
1993 /* Compute number of glyphs needed in a glyph row. */ | |
1994 dim.width = (((window_pixel_width + ch_dim.width - 1) | |
1995 / ch_dim.width) | |
1996 /* 2 partially visible columns in the text area. */ | |
1997 + 2 | |
1998 /* One partially visible column at the right | |
1999 edge of each marginal area. */ | |
2000 + 1 + 1); | |
2001 | |
2002 /* Compute number of glyph rows needed. */ | |
2003 dim.height = (((window_pixel_height + ch_dim.height - 1) | |
2004 / ch_dim.height) | |
2005 /* One partially visible line at the top and | |
2006 bottom of the window. */ | |
2007 + 2 | |
2008 /* 2 for top and mode line. */ | |
2009 + 2); | |
2010 | |
2011 /* Change matrices. */ | |
2012 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); | |
2013 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim); | |
2014 } | |
2015 | |
2016 w = NILP (w->next) ? NULL : XWINDOW (w->next); | |
2017 } | |
2018 } | |
2019 | |
2020 | |
2021 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null, | |
2022 do it for all frames; otherwise do it just for the given frame. | |
2023 This function must be called when a new frame is created, its size | |
2024 changes, or its window configuration changes. */ | |
2025 | |
2026 void | |
2027 adjust_glyphs (f) | |
2028 struct frame *f; | |
2029 { | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2030 /* Block input so that expose events and other events that access |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2031 glyph matrices are not processed while we are changing them. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2032 BLOCK_INPUT; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2033 |
25012 | 2034 if (f) |
2035 adjust_frame_glyphs (f); | |
2036 else | |
2037 { | |
2038 Lisp_Object tail, lisp_frame; | |
2039 | |
2040 FOR_EACH_FRAME (tail, lisp_frame) | |
2041 adjust_frame_glyphs (XFRAME (lisp_frame)); | |
2042 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2043 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2044 UNBLOCK_INPUT; |
25012 | 2045 } |
2046 | |
2047 | |
2048 /* Adjust frame glyphs when Emacs is initialized. | |
2049 | |
2050 To be called from init_display. | |
2051 | |
2052 We need a glyph matrix because redraw will happen soon. | |
2053 Unfortunately, window sizes on selected_frame are not yet set to | |
2054 meaningful values. I believe we can assume that there are only two | |
2055 windows on the frame---the mini-buffer and the root window. Frame | |
2056 height and width seem to be correct so far. So, set the sizes of | |
2057 windows to estimated values. */ | |
2058 | |
2059 static void | |
2060 adjust_frame_glyphs_initially () | |
2061 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2062 struct frame *sf = SELECTED_FRAME (); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2063 struct window *root = XWINDOW (sf->root_window); |
25012 | 2064 struct window *mini = XWINDOW (root->next); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2065 int frame_height = FRAME_HEIGHT (sf); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2066 int frame_width = FRAME_WIDTH (sf); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2067 int top_margin = FRAME_TOP_MARGIN (sf); |
25012 | 2068 |
2069 /* Do it for the root window. */ | |
2070 XSETFASTINT (root->top, top_margin); | |
2071 XSETFASTINT (root->width, frame_width); | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2072 set_window_height (sf->root_window, frame_height - 1 - top_margin, 0); |
25012 | 2073 |
2074 /* Do it for the mini-buffer window. */ | |
2075 XSETFASTINT (mini->top, frame_height - 1); | |
2076 XSETFASTINT (mini->width, frame_width); | |
2077 set_window_height (root->next, 1, 0); | |
2078 | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2079 adjust_frame_glyphs (sf); |
25012 | 2080 glyphs_initialized_initially_p = 1; |
2081 } | |
2082 | |
2083 | |
2084 /* Allocate/reallocate glyph matrices of a single frame F. */ | |
2085 | |
2086 static void | |
2087 adjust_frame_glyphs (f) | |
2088 struct frame *f; | |
2089 { | |
2090 if (FRAME_WINDOW_P (f)) | |
2091 adjust_frame_glyphs_for_window_redisplay (f); | |
2092 else | |
2093 adjust_frame_glyphs_for_frame_redisplay (f); | |
2094 | |
2095 /* Don't forget the message buffer and the buffer for | |
2096 decode_mode_spec. */ | |
2097 adjust_frame_message_buffer (f); | |
2098 adjust_decode_mode_spec_buffer (f); | |
2099 | |
2100 f->glyphs_initialized_p = 1; | |
2101 } | |
2102 | |
2103 | |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2104 /* In the window tree with root W, build current matrices of leaf |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2105 windows from the frame's current matrix. */ |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2106 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2107 static void |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2108 fake_current_matrices (window) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2109 Lisp_Object window; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2110 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2111 struct window *w; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2112 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2113 for (; !NILP (window); window = w->next) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2114 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2115 w = XWINDOW (window); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2116 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2117 if (!NILP (w->hchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2118 fake_current_matrices (w->hchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2119 else if (!NILP (w->vchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2120 fake_current_matrices (w->vchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2121 else |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2122 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2123 int i; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2124 struct frame *f = XFRAME (w->frame); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2125 struct glyph_matrix *m = w->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2126 struct glyph_matrix *fm = f->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2127 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2128 xassert (m->matrix_h == XFASTINT (w->height)); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2129 xassert (m->matrix_w == XFASTINT (w->width)); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2130 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2131 for (i = 0; i < m->matrix_h; ++i) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2132 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2133 struct glyph_row *r = m->rows + i; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2134 struct glyph_row *fr = fm->rows + i + XFASTINT (w->top); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2135 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2136 xassert (r->glyphs[TEXT_AREA] >= fr->glyphs[TEXT_AREA] |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2137 && r->glyphs[LAST_AREA] <= fr->glyphs[LAST_AREA]); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2138 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2139 r->enabled_p = fr->enabled_p; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2140 if (r->enabled_p) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2141 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2142 r->used[LEFT_MARGIN_AREA] = m->left_margin_glyphs; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2143 r->used[RIGHT_MARGIN_AREA] = m->right_margin_glyphs; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2144 r->used[TEXT_AREA] = (m->matrix_w |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2145 - r->used[LEFT_MARGIN_AREA] |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2146 - r->used[RIGHT_MARGIN_AREA]); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2147 r->mode_line_p = 0; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2148 r->inverse_p = fr->inverse_p; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2149 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2150 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2151 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2152 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2153 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2154 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2155 |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2156 /* Save or restore the contents of frame F's current frame matrix. |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2157 SAVE_P non-zero means save it. */ |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2158 |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2159 static void |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2160 save_or_restore_current_matrix (f, save_p) |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2161 struct frame *f; |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2162 int save_p; |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2163 { |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2164 struct glyph_row *from, *to, *end; |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2165 |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2166 if (save_p) |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2167 { |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2168 from = f->current_matrix->rows; |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2169 end = from + f->current_matrix->nrows; |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2170 to = f->desired_matrix->rows; |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2171 } |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2172 else |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2173 { |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2174 from = f->desired_matrix->rows; |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2175 end = from + f->desired_matrix->nrows; |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2176 to = f->current_matrix->rows; |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2177 } |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2178 |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2179 for (; from < end; ++from, ++to) |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2180 { |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2181 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2182 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2183 to->used[TEXT_AREA] = from->used[TEXT_AREA]; |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2184 } |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2185 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2186 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2187 |
25012 | 2188 /* Allocate/reallocate glyph matrices of a single frame F for |
2189 frame-based redisplay. */ | |
2190 | |
2191 static void | |
2192 adjust_frame_glyphs_for_frame_redisplay (f) | |
2193 struct frame *f; | |
2194 { | |
2195 struct dim ch_dim; | |
2196 struct dim matrix_dim; | |
2197 int pool_changed_p; | |
2198 int window_change_flags; | |
2199 int top_window_y; | |
2200 | |
2201 if (!FRAME_LIVE_P (f)) | |
2202 return; | |
2203 | |
2204 /* Determine the smallest character in any font for F. On | |
2205 console windows, all characters have dimension (1, 1). */ | |
2206 ch_dim.width = ch_dim.height = 1; | |
2207 | |
2208 top_window_y = FRAME_TOP_MARGIN (f); | |
2209 | |
2210 /* Allocate glyph pool structures if not already done. */ | |
2211 if (f->desired_pool == NULL) | |
2212 { | |
2213 f->desired_pool = new_glyph_pool (); | |
2214 f->current_pool = new_glyph_pool (); | |
2215 } | |
2216 | |
2217 /* Allocate frames matrix structures if needed. */ | |
2218 if (f->desired_matrix == NULL) | |
2219 { | |
2220 f->desired_matrix = new_glyph_matrix (f->desired_pool); | |
2221 f->current_matrix = new_glyph_matrix (f->current_pool); | |
2222 } | |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2223 |
25012 | 2224 /* Compute window glyph matrices. (This takes the mini-buffer |
2225 window into account). The result is the size of the frame glyph | |
2226 matrix needed. The variable window_change_flags is set to a bit | |
2227 mask indicating whether new matrices will be allocated or | |
2228 existing matrices change their size or location within the frame | |
2229 matrix. */ | |
2230 window_change_flags = 0; | |
2231 matrix_dim | |
2232 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
2233 0, top_window_y, | |
2234 ch_dim, 1, | |
2235 &window_change_flags); | |
2236 | |
2237 /* Add in menu bar lines, if any. */ | |
2238 matrix_dim.height += top_window_y; | |
2239 | |
2240 /* Enlarge pools as necessary. */ | |
2241 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim); | |
2242 realloc_glyph_pool (f->current_pool, matrix_dim); | |
2243 | |
2244 /* Set up glyph pointers within window matrices. Do this only if | |
2245 absolutely necessary since it requires a frame redraw. */ | |
2246 if (pool_changed_p || window_change_flags) | |
2247 { | |
2248 /* Do it for window matrices. */ | |
2249 allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
2250 0, top_window_y, ch_dim, 0, | |
2251 &window_change_flags); | |
2252 | |
2253 /* Size of frame matrices must equal size of frame. Note | |
2254 that we are called for X frames with window widths NOT equal | |
2255 to the frame width (from CHANGE_FRAME_SIZE_1). */ | |
2256 xassert (matrix_dim.width == FRAME_WIDTH (f) | |
2257 && matrix_dim.height == FRAME_HEIGHT (f)); | |
2258 | |
2259 /* Resize frame matrices. */ | |
2260 adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim); | |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2261 |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2262 /* Pointers to glyph memory in glyph rows are exchanged during |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2263 the update phase of redisplay, which means in general that a |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2264 frame's current matrix consists of pointers into both the |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2265 desired and current glyph pool of the frame. Adjusting a |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2266 matrix sets the frame matrix up so that pointers are all into |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2267 the same pool. If we want to preserve glyph contents of the |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2268 current matrix over a call to adjust_glyph_matrix, we must |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2269 make a copy of the current glyphs, and restore the current |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2270 matrix' contents from that copy. */ |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2271 if (display_completed |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2272 && !FRAME_GARBAGED_P (f) |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2273 && matrix_dim.width == f->current_matrix->matrix_w |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2274 && matrix_dim.height == f->current_matrix->matrix_h) |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2275 { |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2276 save_or_restore_current_matrix (f, 1); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2277 adjust_glyph_matrix (NULL, f->current_matrix, 0, 0, matrix_dim); |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2278 save_or_restore_current_matrix (f, 0); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2279 fake_current_matrices (FRAME_ROOT_WINDOW (f)); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2280 } |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2281 else |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2282 { |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2283 adjust_glyph_matrix (NULL, f->current_matrix, 0, 0, matrix_dim); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2284 SET_FRAME_GARBAGED (f); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2285 } |
25012 | 2286 } |
2287 } | |
2288 | |
2289 | |
2290 /* Allocate/reallocate glyph matrices of a single frame F for | |
2291 window-based redisplay. */ | |
2292 | |
2293 static void | |
2294 adjust_frame_glyphs_for_window_redisplay (f) | |
2295 struct frame *f; | |
2296 { | |
2297 struct dim ch_dim; | |
2298 struct window *w; | |
2299 | |
2300 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f)); | |
2301 | |
2302 /* Get minimum sizes. */ | |
2303 #ifdef HAVE_WINDOW_SYSTEM | |
2304 ch_dim.width = FRAME_SMALLEST_CHAR_WIDTH (f); | |
2305 ch_dim.height = FRAME_SMALLEST_FONT_HEIGHT (f); | |
2306 #else | |
2307 ch_dim.width = ch_dim.height = 1; | |
2308 #endif | |
2309 | |
2310 /* Allocate/reallocate window matrices. */ | |
2311 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f)), | |
2312 ch_dim); | |
2313 | |
2314 /* Allocate/ reallocate matrices of the dummy window used to display | |
2315 the menu bar under X when no X toolkit support is available. */ | |
2316 #ifndef USE_X_TOOLKIT | |
2317 { | |
2318 /* Allocate a dummy window if not already done. */ | |
2319 if (NILP (f->menu_bar_window)) | |
2320 { | |
2321 f->menu_bar_window = make_window (); | |
2322 w = XWINDOW (f->menu_bar_window); | |
2323 XSETFRAME (w->frame, f); | |
2324 w->pseudo_window_p = 1; | |
2325 } | |
2326 else | |
2327 w = XWINDOW (f->menu_bar_window); | |
2328 | |
2329 /* Set window dimensions to frame dimensions and allocate or | |
2330 adjust glyph matrices of W. */ | |
2331 XSETFASTINT (w->top, 0); | |
2332 XSETFASTINT (w->left, 0); | |
2333 XSETFASTINT (w->height, FRAME_MENU_BAR_LINES (f)); | |
2334 XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f)); | |
2335 allocate_matrices_for_window_redisplay (w, ch_dim); | |
2336 } | |
2337 #endif /* not USE_X_TOOLKIT */ | |
2338 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2339 /* Allocate/ reallocate matrices of the tool bar window. If we |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2340 don't have a tool bar window yet, make one. */ |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2341 if (NILP (f->tool_bar_window)) |
25012 | 2342 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2343 f->tool_bar_window = make_window (); |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2344 w = XWINDOW (f->tool_bar_window); |
25012 | 2345 XSETFRAME (w->frame, f); |
2346 w->pseudo_window_p = 1; | |
2347 } | |
2348 else | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2349 w = XWINDOW (f->tool_bar_window); |
25012 | 2350 |
2351 XSETFASTINT (w->top, FRAME_MENU_BAR_LINES (f)); | |
2352 XSETFASTINT (w->left, 0); | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2353 XSETFASTINT (w->height, FRAME_TOOL_BAR_LINES (f)); |
25012 | 2354 XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f)); |
2355 allocate_matrices_for_window_redisplay (w, ch_dim); | |
2356 } | |
2357 | |
2358 | |
2359 /* Adjust/ allocate message buffer of frame F. | |
2360 | |
2361 Note that the message buffer is never freed. Since I could not | |
2362 find a free in 19.34, I assume that freeing it would be | |
2363 problematic in some way and don't do it either. | |
2364 | |
2365 (Implementation note: It should be checked if we can free it | |
2366 eventually without causing trouble). */ | |
2367 | |
2368 static void | |
2369 adjust_frame_message_buffer (f) | |
2370 struct frame *f; | |
2371 { | |
2372 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1; | |
2373 | |
2374 if (FRAME_MESSAGE_BUF (f)) | |
2375 { | |
2376 char *buffer = FRAME_MESSAGE_BUF (f); | |
2377 char *new_buffer = (char *) xrealloc (buffer, size); | |
2378 FRAME_MESSAGE_BUF (f) = new_buffer; | |
2379 } | |
2380 else | |
2381 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size); | |
2382 } | |
2383 | |
2384 | |
2385 /* Re-allocate buffer for decode_mode_spec on frame F. */ | |
2386 | |
2387 static void | |
2388 adjust_decode_mode_spec_buffer (f) | |
2389 struct frame *f; | |
2390 { | |
2391 f->decode_mode_spec_buffer | |
2392 = (char *) xrealloc (f->decode_mode_spec_buffer, | |
2393 FRAME_MESSAGE_BUF_SIZE (f) + 1); | |
2394 } | |
2395 | |
2396 | |
2397 | |
2398 /********************************************************************** | |
2399 Freeing Glyph Matrices | |
2400 **********************************************************************/ | |
2401 | |
2402 /* Free glyph memory for a frame F. F may be null. This function can | |
2403 be called for the same frame more than once. The root window of | |
2404 F may be nil when this function is called. This is the case when | |
2405 the function is called when F is destroyed. */ | |
2406 | |
2407 void | |
2408 free_glyphs (f) | |
2409 struct frame *f; | |
2410 { | |
2411 if (f && f->glyphs_initialized_p) | |
2412 { | |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2413 /* Block interrupt input so that we don't get surprised by an X |
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2414 event while we're in an inconsistent state. */ |
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2415 BLOCK_INPUT; |
25012 | 2416 f->glyphs_initialized_p = 0; |
2417 | |
2418 /* Release window sub-matrices. */ | |
2419 if (!NILP (f->root_window)) | |
2420 free_window_matrices (XWINDOW (f->root_window)); | |
2421 | |
2422 /* Free the dummy window for menu bars without X toolkit and its | |
2423 glyph matrices. */ | |
2424 if (!NILP (f->menu_bar_window)) | |
2425 { | |
2426 struct window *w = XWINDOW (f->menu_bar_window); | |
2427 free_glyph_matrix (w->desired_matrix); | |
2428 free_glyph_matrix (w->current_matrix); | |
2429 w->desired_matrix = w->current_matrix = NULL; | |
2430 f->menu_bar_window = Qnil; | |
2431 } | |
2432 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2433 /* Free the tool bar window and its glyph matrices. */ |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2434 if (!NILP (f->tool_bar_window)) |
25012 | 2435 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2436 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 2437 free_glyph_matrix (w->desired_matrix); |
2438 free_glyph_matrix (w->current_matrix); | |
2439 w->desired_matrix = w->current_matrix = NULL; | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2440 f->tool_bar_window = Qnil; |
25012 | 2441 } |
2442 | |
2443 /* Release frame glyph matrices. Reset fields to zero in | |
2444 case we are called a second time. */ | |
2445 if (f->desired_matrix) | |
2446 { | |
2447 free_glyph_matrix (f->desired_matrix); | |
2448 free_glyph_matrix (f->current_matrix); | |
2449 f->desired_matrix = f->current_matrix = NULL; | |
2450 } | |
2451 | |
2452 /* Release glyph pools. */ | |
2453 if (f->desired_pool) | |
2454 { | |
2455 free_glyph_pool (f->desired_pool); | |
2456 free_glyph_pool (f->current_pool); | |
2457 f->desired_pool = f->current_pool = NULL; | |
314 | 2458 } |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2459 |
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2460 UNBLOCK_INPUT; |
314 | 2461 } |
2462 } | |
2463 | |
25012 | 2464 |
2465 /* Free glyph sub-matrices in the window tree rooted at W. This | |
2466 function may be called with a null pointer, and it may be called on | |
2467 the same tree more than once. */ | |
2468 | |
2469 void | |
2470 free_window_matrices (w) | |
2471 struct window *w; | |
2472 { | |
2473 while (w) | |
2474 { | |
2475 if (!NILP (w->hchild)) | |
2476 free_window_matrices (XWINDOW (w->hchild)); | |
2477 else if (!NILP (w->vchild)) | |
2478 free_window_matrices (XWINDOW (w->vchild)); | |
2479 else | |
2480 { | |
2481 /* This is a leaf window. Free its memory and reset fields | |
2482 to zero in case this function is called a second time for | |
2483 W. */ | |
2484 free_glyph_matrix (w->current_matrix); | |
2485 free_glyph_matrix (w->desired_matrix); | |
2486 w->current_matrix = w->desired_matrix = NULL; | |
2487 } | |
2488 | |
2489 /* Next window on same level. */ | |
2490 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
2491 } | |
2492 } | |
2493 | |
2494 | |
2495 /* Check glyph memory leaks. This function is called from | |
2496 shut_down_emacs. Note that frames are not destroyed when Emacs | |
2497 exits. We therefore free all glyph memory for all active frames | |
2498 explicitly and check that nothing is left allocated. */ | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2499 |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2500 void |
25012 | 2501 check_glyph_memory () |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2502 { |
25012 | 2503 Lisp_Object tail, frame; |
2504 | |
2505 /* Free glyph memory for all frames. */ | |
2506 FOR_EACH_FRAME (tail, frame) | |
2507 free_glyphs (XFRAME (frame)); | |
2508 | |
2509 /* Check that nothing is left allocated. */ | |
2510 if (glyph_matrix_count) | |
2511 abort (); | |
2512 if (glyph_pool_count) | |
2513 abort (); | |
2514 } | |
2515 | |
2516 | |
2517 | |
2518 /********************************************************************** | |
2519 Building a Frame Matrix | |
2520 **********************************************************************/ | |
2521 | |
2522 /* Most of the redisplay code works on glyph matrices attached to | |
2523 windows. This is a good solution most of the time, but it is not | |
2524 suitable for terminal code. Terminal output functions cannot rely | |
2525 on being able to set an arbitrary terminal window. Instead they | |
2526 must be provided with a view of the whole frame, i.e. the whole | |
2527 screen. We build such a view by constructing a frame matrix from | |
2528 window matrices in this section. | |
2529 | |
2530 Windows that must be updated have their must_be_update_p flag set. | |
2531 For all such windows, their desired matrix is made part of the | |
2532 desired frame matrix. For other windows, their current matrix is | |
2533 made part of the desired frame matrix. | |
2534 | |
2535 +-----------------+----------------+ | |
2536 | desired | desired | | |
2537 | | | | |
2538 +-----------------+----------------+ | |
2539 | current | | |
2540 | | | |
2541 +----------------------------------+ | |
2542 | |
2543 Desired window matrices can be made part of the frame matrix in a | |
2544 cheap way: We exploit the fact that the desired frame matrix and | |
2545 desired window matrices share their glyph memory. This is not | |
2546 possible for current window matrices. Their glyphs are copied to | |
2547 the desired frame matrix. The latter is equivalent to | |
2548 preserve_other_columns in the old redisplay. | |
2549 | |
2550 Used glyphs counters for frame matrix rows are the result of adding | |
2551 up glyph lengths of the window matrices. A line in the frame | |
2552 matrix is enabled, if a corresponding line in a window matrix is | |
2553 enabled. | |
2554 | |
2555 After building the desired frame matrix, it will be passed to | |
2556 terminal code, which will manipulate both the desired and current | |
2557 frame matrix. Changes applied to the frame's current matrix have | |
2558 to be visible in current window matrices afterwards, of course. | |
2559 | |
2560 This problem is solved like this: | |
2561 | |
2562 1. Window and frame matrices share glyphs. Window matrices are | |
2563 constructed in a way that their glyph contents ARE the glyph | |
2564 contents needed in a frame matrix. Thus, any modification of | |
2565 glyphs done in terminal code will be reflected in window matrices | |
2566 automatically. | |
2567 | |
2568 2. Exchanges of rows in a frame matrix done by terminal code are | |
2569 intercepted by hook functions so that corresponding row operations | |
2570 on window matrices can be performed. This is necessary because we | |
2571 use pointers to glyphs in glyph row structures. To satisfy the | |
2572 assumption of point 1 above that glyphs are updated implicitly in | |
2573 window matrices when they are manipulated via the frame matrix, | |
2574 window and frame matrix must of course agree where to find the | |
2575 glyphs for their rows. Possible manipulations that must be | |
2576 mirrored are assignments of rows of the desired frame matrix to the | |
2577 current frame matrix and scrolling the current frame matrix. */ | |
2578 | |
2579 /* Build frame F's desired matrix from window matrices. Only windows | |
2580 which have the flag must_be_updated_p set have to be updated. Menu | |
2581 bar lines of a frame are not covered by window matrices, so make | |
2582 sure not to touch them in this function. */ | |
2583 | |
2584 static void | |
2585 build_frame_matrix (f) | |
2586 struct frame *f; | |
2587 { | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2588 int i; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2589 |
25012 | 2590 /* F must have a frame matrix when this function is called. */ |
2591 xassert (!FRAME_WINDOW_P (f)); | |
2592 | |
2593 /* Clear all rows in the frame matrix covered by window matrices. | |
2594 Menu bar lines are not covered by windows. */ | |
2595 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i) | |
2596 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i)); | |
2597 | |
2598 /* Build the matrix by walking the window tree. */ | |
2599 build_frame_matrix_from_window_tree (f->desired_matrix, | |
2600 XWINDOW (FRAME_ROOT_WINDOW (f))); | |
2601 } | |
2602 | |
2603 | |
2604 /* Walk a window tree, building a frame matrix MATRIX from window | |
2605 matrices. W is the root of a window tree. */ | |
2606 | |
2607 static void | |
2608 build_frame_matrix_from_window_tree (matrix, w) | |
2609 struct glyph_matrix *matrix; | |
2610 struct window *w; | |
2611 { | |
2612 while (w) | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2613 { |
25012 | 2614 if (!NILP (w->hchild)) |
2615 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild)); | |
2616 else if (!NILP (w->vchild)) | |
2617 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild)); | |
2618 else | |
2619 build_frame_matrix_from_leaf_window (matrix, w); | |
2620 | |
2621 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2622 } |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2623 } |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2624 |
25012 | 2625 |
2626 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the | |
2627 desired frame matrix built. W is a leaf window whose desired or | |
2628 current matrix is to be added to FRAME_MATRIX. W's flag | |
2629 must_be_updated_p determines which matrix it contributes to | |
2630 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix | |
2631 is added to FRAME_MATRIX, otherwise W's current matrix is added. | |
2632 Adding a desired matrix means setting up used counters and such in | |
2633 frame rows, while adding a current window matrix to FRAME_MATRIX | |
2634 means copying glyphs. The latter case corresponds to | |
2635 preserve_other_columns in the old redisplay. */ | |
2636 | |
2637 static void | |
2638 build_frame_matrix_from_leaf_window (frame_matrix, w) | |
2639 struct glyph_matrix *frame_matrix; | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2640 struct window *w; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2641 { |
25012 | 2642 struct glyph_matrix *window_matrix; |
2643 int window_y, frame_y; | |
2644 /* If non-zero, a glyph to insert at the right border of W. */ | |
2645 GLYPH right_border_glyph = 0; | |
2646 | |
2647 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */ | |
2648 if (w->must_be_updated_p) | |
2649 { | |
2650 window_matrix = w->desired_matrix; | |
2651 | |
2652 /* Decide whether we want to add a vertical border glyph. */ | |
2653 if (!WINDOW_RIGHTMOST_P (w)) | |
2654 { | |
2655 struct Lisp_Char_Table *dp = window_display_table (w); | |
2656 right_border_glyph = (dp && INTEGERP (DISP_BORDER_GLYPH (dp)) | |
2657 ? XINT (DISP_BORDER_GLYPH (dp)) | |
2658 : '|'); | |
2659 } | |
2660 } | |
2661 else | |
2662 window_matrix = w->current_matrix; | |
2663 | |
2664 /* For all rows in the window matrix and corresponding rows in the | |
2665 frame matrix. */ | |
2666 window_y = 0; | |
2667 frame_y = window_matrix->matrix_y; | |
2668 while (window_y < window_matrix->nrows) | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2669 { |
25012 | 2670 struct glyph_row *frame_row = frame_matrix->rows + frame_y; |
2671 struct glyph_row *window_row = window_matrix->rows + window_y; | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2672 int current_row_p = window_matrix == w->current_matrix; |
25012 | 2673 |
2674 /* Fill up the frame row with spaces up to the left margin of the | |
2675 window row. */ | |
2676 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x); | |
2677 | |
2678 /* Fill up areas in the window matrix row with spaces. */ | |
2679 fill_up_glyph_row_with_spaces (window_row); | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2680 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2681 /* If only part of W's desired matrix has been built, and |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2682 window_row wasn't displayed, use the corresponding current |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2683 row instead. */ |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2684 if (window_matrix == w->desired_matrix |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2685 && !window_row->enabled_p) |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2686 { |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2687 window_row = w->current_matrix->rows + window_y; |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2688 current_row_p = 1; |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2689 } |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2690 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2691 if (current_row_p) |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2692 { |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2693 /* Copy window row to frame row. */ |
25012 | 2694 bcopy (window_row->glyphs[0], |
2695 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x, | |
2696 window_matrix->matrix_w * sizeof (struct glyph)); | |
2697 } | |
2698 else | |
2699 { | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2700 xassert (window_row->enabled_p); |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2701 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2702 /* Only when a desired row has been displayed, we want |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2703 the corresponding frame row to be updated. */ |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2704 frame_row->enabled_p = 1; |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2705 |
25012 | 2706 /* Maybe insert a vertical border between horizontally adjacent |
2707 windows. */ | |
2708 if (right_border_glyph) | |
2709 { | |
2710 struct glyph *border = window_row->glyphs[LAST_AREA] - 1; | |
2711 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); | |
2712 } | |
2713 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2714 /* Window row window_y must be a slice of frame row |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2715 frame_y. */ |
25012 | 2716 xassert (glyph_row_slice_p (window_row, frame_row)); |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2717 |
25012 | 2718 /* If rows are in sync, we don't have to copy glyphs because |
2719 frame and window share glyphs. */ | |
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2720 |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2721 #if GLYPH_DEBUG |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2722 strcpy (w->current_matrix->method, w->desired_matrix->method); |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
2723 add_window_display_history (w, w->current_matrix->method, 0); |
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2724 #endif |
25012 | 2725 } |
2726 | |
2727 /* Set number of used glyphs in the frame matrix. Since we fill | |
2728 up with spaces, and visit leaf windows from left to right it | |
2729 can be done simply. */ | |
2730 frame_row->used[TEXT_AREA] | |
2731 = window_matrix->matrix_x + window_matrix->matrix_w; | |
2732 | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2733 /* Or in other flags. */ |
25012 | 2734 frame_row->inverse_p |= window_row->inverse_p; |
2735 | |
2736 /* Next row. */ | |
2737 ++window_y; | |
2738 ++frame_y; | |
2739 } | |
2740 } | |
2741 | |
2742 | |
2743 /* Add spaces to a glyph row ROW in a window matrix. | |
2744 | |
2745 Each row has the form: | |
2746 | |
2747 +---------+-----------------------------+------------+ | |
2748 | left | text | right | | |
2749 +---------+-----------------------------+------------+ | |
2750 | |
2751 Left and right marginal areas are optional. This function adds | |
2752 spaces to areas so that there are no empty holes between areas. | |
2753 In other words: If the right area is not empty, the text area | |
2754 is filled up with spaces up to the right area. If the text area | |
2755 is not empty, the left area is filled up. | |
2756 | |
2757 To be called for frame-based redisplay, only. */ | |
2758 | |
2759 static void | |
2760 fill_up_glyph_row_with_spaces (row) | |
2761 struct glyph_row *row; | |
2762 { | |
2763 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA); | |
2764 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA); | |
2765 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA); | |
2766 } | |
2767 | |
2768 | |
2769 /* Fill area AREA of glyph row ROW with spaces. To be called for | |
2770 frame-based redisplay only. */ | |
2771 | |
2772 static void | |
2773 fill_up_glyph_row_area_with_spaces (row, area) | |
2774 struct glyph_row *row; | |
2775 int area; | |
2776 { | |
2777 if (row->glyphs[area] < row->glyphs[area + 1]) | |
2778 { | |
2779 struct glyph *end = row->glyphs[area + 1]; | |
2780 struct glyph *text = row->glyphs[area] + row->used[area]; | |
2781 | |
2782 while (text < end) | |
2783 *text++ = space_glyph; | |
2784 row->used[area] = text - row->glyphs[area]; | |
2785 } | |
2786 } | |
2787 | |
2788 | |
2789 /* Add spaces to the end of ROW in a frame matrix until index UPTO is | |
2790 reached. In frame matrices only one area, TEXT_AREA, is used. */ | |
2791 | |
2792 static void | |
2793 fill_up_frame_row_with_spaces (row, upto) | |
2794 struct glyph_row *row; | |
2795 int upto; | |
2796 { | |
2797 int i = row->used[TEXT_AREA]; | |
2798 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
2799 | |
2800 while (i < upto) | |
2801 glyph[i++] = space_glyph; | |
2802 | |
2803 row->used[TEXT_AREA] = i; | |
2804 } | |
2805 | |
2806 | |
2807 | |
2808 /********************************************************************** | |
2809 Mirroring operations on frame matrices in window matrices | |
2810 **********************************************************************/ | |
2811 | |
2812 /* Set frame being updated via frame-based redisplay to F. This | |
2813 function must be called before updates to make explicit that we are | |
2814 working on frame matrices or not. */ | |
2815 | |
2816 static INLINE void | |
2817 set_frame_matrix_frame (f) | |
2818 struct frame *f; | |
2819 { | |
2820 frame_matrix_frame = f; | |
2821 } | |
2822 | |
2823 | |
2824 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date. | |
2825 DESIRED_MATRIX is the desired matrix corresponding to | |
2826 CURRENT_MATRIX. The update is done by exchanging glyph pointers | |
2827 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If | |
2828 frame_matrix_frame is non-null, this indicates that the exchange is | |
2829 done in frame matrices, and that we have to perform analogous | |
2830 operations in window matrices of frame_matrix_frame. */ | |
2831 | |
2832 static INLINE void | |
2833 make_current (desired_matrix, current_matrix, row) | |
2834 struct glyph_matrix *desired_matrix, *current_matrix; | |
2835 int row; | |
2836 { | |
2837 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); | |
2838 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, row); | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
2839 int mouse_face_p = current_row->mouse_face_p; |
25012 | 2840 |
2841 /* Do current_row = desired_row. This exchanges glyph pointers | |
2842 between both rows, and does a structure assignment otherwise. */ | |
2843 assign_row (current_row, desired_row); | |
2844 | |
2845 /* Enable current_row to mark it as valid. */ | |
2846 current_row->enabled_p = 1; | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
2847 current_row->mouse_face_p = mouse_face_p; |
25012 | 2848 |
2849 /* If we are called on frame matrices, perform analogous operations | |
2850 for window matrices. */ | |
2851 if (frame_matrix_frame) | |
2852 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row); | |
2853 } | |
2854 | |
2855 | |
2856 /* W is the root of a window tree. FRAME_ROW is the index of a row in | |
2857 W's frame which has been made current (by swapping pointers between | |
2858 current and desired matrix). Perform analogous operations in the | |
2859 matrices of leaf windows in the window tree rooted at W. */ | |
2860 | |
2861 static void | |
2862 mirror_make_current (w, frame_row) | |
2863 struct window *w; | |
2864 int frame_row; | |
2865 { | |
2866 while (w) | |
2867 { | |
2868 if (!NILP (w->hchild)) | |
2869 mirror_make_current (XWINDOW (w->hchild), frame_row); | |
2870 else if (!NILP (w->vchild)) | |
2871 mirror_make_current (XWINDOW (w->vchild), frame_row); | |
2872 else | |
2873 { | |
2874 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS | |
2875 here because the checks performed in debug mode there | |
2876 will not allow the conversion. */ | |
2877 int row = frame_row - w->desired_matrix->matrix_y; | |
2878 | |
2879 /* If FRAME_ROW is within W, assign the desired row to the | |
2880 current row (exchanging glyph pointers). */ | |
2881 if (row >= 0 && row < w->desired_matrix->matrix_h) | |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2882 { |
25012 | 2883 struct glyph_row *current_row |
2884 = MATRIX_ROW (w->current_matrix, row); | |
2885 struct glyph_row *desired_row | |
2886 = MATRIX_ROW (w->desired_matrix, row); | |
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2887 |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2888 if (desired_row->enabled_p) |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2889 assign_row (current_row, desired_row); |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2890 else |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2891 swap_glyph_pointers (desired_row, current_row); |
25012 | 2892 current_row->enabled_p = 1; |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2893 } |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2894 } |
25012 | 2895 |
2896 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2897 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2898 } |
25012 | 2899 |
2900 | |
2901 /* Perform row dance after scrolling. We are working on the range of | |
2902 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not | |
2903 including) in MATRIX. COPY_FROM is a vector containing, for each | |
2904 row I in the range 0 <= I < NLINES, the index of the original line | |
2905 to move to I. This index is relative to the row range, i.e. 0 <= | |
2906 index < NLINES. RETAINED_P is a vector containing zero for each | |
2907 row 0 <= I < NLINES which is empty. | |
2908 | |
2909 This function is called from do_scrolling and do_direct_scrolling. */ | |
2910 | |
2911 void | |
2912 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, | |
2913 retained_p) | |
2914 struct glyph_matrix *matrix; | |
2915 int unchanged_at_top, nlines; | |
2916 int *copy_from; | |
2917 char *retained_p; | |
2918 { | |
2919 /* A copy of original rows. */ | |
2920 struct glyph_row *old_rows; | |
2921 | |
2922 /* Rows to assign to. */ | |
2923 struct glyph_row *new_rows = MATRIX_ROW (matrix, unchanged_at_top); | |
2924 | |
2925 int i; | |
2926 | |
2927 /* Make a copy of the original rows. */ | |
2928 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows); | |
2929 bcopy (new_rows, old_rows, nlines * sizeof *old_rows); | |
2930 | |
2931 /* Assign new rows, maybe clear lines. */ | |
2932 for (i = 0; i < nlines; ++i) | |
2933 { | |
2934 int enabled_before_p = new_rows[i].enabled_p; | |
2935 | |
2936 xassert (i + unchanged_at_top < matrix->nrows); | |
2937 xassert (unchanged_at_top + copy_from[i] < matrix->nrows); | |
2938 new_rows[i] = old_rows[copy_from[i]]; | |
2939 new_rows[i].enabled_p = enabled_before_p; | |
2940 | |
2941 /* RETAINED_P is zero for empty lines. */ | |
2942 if (!retained_p[copy_from[i]]) | |
2943 new_rows[i].enabled_p = 0; | |
2944 } | |
2945 | |
2946 /* Do the same for window matrices, if MATRIX Is a frame matrix. */ | |
2947 if (frame_matrix_frame) | |
2948 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window), | |
2949 unchanged_at_top, nlines, copy_from, retained_p); | |
2950 } | |
2951 | |
2952 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2953 /* Synchronize glyph pointers in the current matrix of window W with |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2954 the current frame matrix. W must be full-width, and be on a tty |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2955 frame. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2956 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2957 static void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2958 sync_window_with_frame_matrix_rows (w) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2959 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2960 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2961 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2962 struct glyph_row *window_row, *window_row_end, *frame_row; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2963 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2964 /* Preconditions: W must be a leaf window and full-width. Its frame |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2965 must have a frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2966 xassert (NILP (w->hchild) && NILP (w->vchild)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2967 xassert (WINDOW_FULL_WIDTH_P (w)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2968 xassert (!FRAME_WINDOW_P (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2969 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2970 /* If W is a full-width window, glyph pointers in W's current matrix |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2971 have, by definition, to be the same as glyph pointers in the |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2972 corresponding frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2973 window_row = w->current_matrix->rows; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2974 window_row_end = window_row + w->current_matrix->nrows; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2975 frame_row = f->current_matrix->rows + XFASTINT (w->top); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2976 while (window_row < window_row_end) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2977 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2978 int area; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2979 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2980 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2981 window_row->glyphs[area] = frame_row->glyphs[area]; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2982 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2983 ++window_row, ++frame_row; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2984 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2985 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2986 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2987 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2988 /* Return the window in the window tree rooted in W containing frame |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2989 row ROW. Value is null if none is found. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2990 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2991 struct window * |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2992 frame_row_to_window (w, row) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2993 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2994 int row; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2995 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2996 struct window *found = NULL; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2997 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2998 while (w && !found) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2999 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3000 if (!NILP (w->hchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3001 found = frame_row_to_window (XWINDOW (w->hchild), row); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3002 else if (!NILP (w->vchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3003 found = frame_row_to_window (XWINDOW (w->vchild), row); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3004 else if (row >= XFASTINT (w->top) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3005 && row < XFASTINT (w->top) + XFASTINT (w->height)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3006 found = w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3007 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3008 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3009 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3010 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3011 return found; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3012 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3013 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3014 |
25012 | 3015 /* Perform a line dance in the window tree rooted at W, after |
3016 scrolling a frame matrix in mirrored_line_dance. | |
3017 | |
3018 We are working on the range of lines UNCHANGED_AT_TOP + 1 to | |
3019 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix. | |
3020 COPY_FROM is a vector containing, for each row I in the range 0 <= | |
3021 I < NLINES, the index of the original line to move to I. This | |
3022 index is relative to the row range, i.e. 0 <= index < NLINES. | |
3023 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES | |
3024 which is empty. */ | |
3025 | |
3026 static void | |
3027 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) | |
3028 struct window *w; | |
3029 int unchanged_at_top, nlines; | |
3030 int *copy_from; | |
3031 char *retained_p; | |
3032 { | |
3033 while (w) | |
3034 { | |
3035 if (!NILP (w->hchild)) | |
3036 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top, | |
3037 nlines, copy_from, retained_p); | |
3038 else if (!NILP (w->vchild)) | |
3039 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top, | |
3040 nlines, copy_from, retained_p); | |
3041 else | |
3042 { | |
3043 /* W is a leaf window, and we are working on its current | |
3044 matrix m. */ | |
3045 struct glyph_matrix *m = w->current_matrix; | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3046 int i, sync_p = 0; |
25012 | 3047 struct glyph_row *old_rows; |
3048 | |
3049 /* Make a copy of the original rows of matrix m. */ | |
3050 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows); | |
3051 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows); | |
3052 | |
3053 for (i = 0; i < nlines; ++i) | |
3054 { | |
3055 /* Frame relative line assigned to. */ | |
3056 int frame_to = i + unchanged_at_top; | |
3057 | |
3058 /* Frame relative line assigned. */ | |
3059 int frame_from = copy_from[i] + unchanged_at_top; | |
3060 | |
3061 /* Window relative line assigned to. */ | |
3062 int window_to = frame_to - m->matrix_y; | |
3063 | |
3064 /* Window relative line assigned. */ | |
3065 int window_from = frame_from - m->matrix_y; | |
3066 | |
3067 /* Is assigned line inside window? */ | |
3068 int from_inside_window_p | |
3069 = window_from >= 0 && window_from < m->matrix_h; | |
3070 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3071 /* Is assigned to line inside window? */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3072 int to_inside_window_p |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3073 = window_to >= 0 && window_to < m->matrix_h; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3074 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3075 if (from_inside_window_p && to_inside_window_p) |
25012 | 3076 { |
3077 /* Enabled setting before assignment. */ | |
3078 int enabled_before_p; | |
3079 | |
3080 /* Do the assignment. The enabled_p flag is saved | |
3081 over the assignment because the old redisplay did | |
3082 that. */ | |
3083 enabled_before_p = m->rows[window_to].enabled_p; | |
3084 m->rows[window_to] = old_rows[window_from]; | |
3085 m->rows[window_to].enabled_p = enabled_before_p; | |
3086 | |
3087 /* If frame line is empty, window line is empty, too. */ | |
3088 if (!retained_p[copy_from[i]]) | |
3089 m->rows[window_to].enabled_p = 0; | |
3090 } | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3091 else if (to_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3092 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3093 /* A copy between windows. This is an infrequent |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3094 case not worth optimizing. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3095 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3096 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3097 struct window *w2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3098 struct glyph_matrix *m2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3099 int m2_from; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3100 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3101 w2 = frame_row_to_window (root, frame_to); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3102 m2 = w2->current_matrix; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3103 m2_from = frame_from - m2->matrix_y; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3104 copy_row_except_pointers (m->rows + window_to, |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3105 m2->rows + m2_from); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3106 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3107 /* If frame line is empty, window line is empty, too. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3108 if (!retained_p[copy_from[i]]) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3109 m->rows[window_to].enabled_p = 0; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3110 sync_p = 1; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3111 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3112 else if (from_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3113 sync_p = 1; |
25012 | 3114 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3115 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3116 /* If there was a copy between windows, make sure glyph |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3117 pointers are in sync with the frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3118 if (sync_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3119 sync_window_with_frame_matrix_rows (w); |
25012 | 3120 |
3121 /* Check that no pointers are lost. */ | |
3122 CHECK_MATRIX (m); | |
3123 } | |
3124 | |
3125 /* Next window on same level. */ | |
3126 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3127 } | |
3128 } | |
3129 | |
3130 | |
3131 #if GLYPH_DEBUG | |
3132 | |
3133 /* Check that window and frame matrices agree about their | |
3134 understanding where glyphs of the rows are to find. For each | |
3135 window in the window tree rooted at W, check that rows in the | |
3136 matrices of leaf window agree with their frame matrices about | |
3137 glyph pointers. */ | |
314 | 3138 |
21514 | 3139 void |
25012 | 3140 check_window_matrix_pointers (w) |
314 | 3141 struct window *w; |
3142 { | |
25012 | 3143 while (w) |
3144 { | |
3145 if (!NILP (w->hchild)) | |
3146 check_window_matrix_pointers (XWINDOW (w->hchild)); | |
3147 else if (!NILP (w->vchild)) | |
3148 check_window_matrix_pointers (XWINDOW (w->vchild)); | |
3149 else | |
3150 { | |
3151 struct frame *f = XFRAME (w->frame); | |
3152 check_matrix_pointers (w->desired_matrix, f->desired_matrix); | |
3153 check_matrix_pointers (w->current_matrix, f->current_matrix); | |
3154 } | |
3155 | |
3156 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3157 } | |
3158 } | |
3159 | |
3160 | |
3161 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is | |
3162 a window and FRAME_MATRIX is the corresponding frame matrix. For | |
3163 each row in WINDOW_MATRIX check that it's a slice of the | |
3164 corresponding frame row. If it isn't, abort. */ | |
3165 | |
3166 static void | |
3167 check_matrix_pointers (window_matrix, frame_matrix) | |
3168 struct glyph_matrix *window_matrix, *frame_matrix; | |
3169 { | |
3170 /* Row number in WINDOW_MATRIX. */ | |
3171 int i = 0; | |
3172 | |
3173 /* Row number corresponding to I in FRAME_MATRIX. */ | |
3174 int j = window_matrix->matrix_y; | |
3175 | |
3176 /* For all rows check that the row in the window matrix is a | |
3177 slice of the row in the frame matrix. If it isn't we didn't | |
3178 mirror an operation on the frame matrix correctly. */ | |
3179 while (i < window_matrix->nrows) | |
3180 { | |
3181 if (!glyph_row_slice_p (window_matrix->rows + i, | |
3182 frame_matrix->rows + j)) | |
3183 abort (); | |
3184 ++i, ++j; | |
3185 } | |
3186 } | |
3187 | |
3188 #endif /* GLYPH_DEBUG != 0 */ | |
3189 | |
3190 | |
3191 | |
3192 /********************************************************************** | |
3193 VPOS and HPOS translations | |
3194 **********************************************************************/ | |
3195 | |
3196 #if GLYPH_DEBUG | |
3197 | |
3198 /* Translate vertical position VPOS which is relative to window W to a | |
3199 vertical position relative to W's frame. */ | |
3200 | |
3201 static int | |
3202 window_to_frame_vpos (w, vpos) | |
3203 struct window *w; | |
3204 int vpos; | |
3205 { | |
3206 struct frame *f = XFRAME (w->frame); | |
3207 | |
3208 xassert (!FRAME_WINDOW_P (f)); | |
3209 xassert (vpos >= 0 && vpos <= w->desired_matrix->nrows); | |
3210 vpos += XFASTINT (w->top); | |
3211 xassert (vpos >= 0 && vpos <= FRAME_HEIGHT (f)); | |
3212 return vpos; | |
3213 } | |
3214 | |
3215 | |
3216 /* Translate horizontal position HPOS which is relative to window W to | |
3217 a vertical position relative to W's frame. */ | |
3218 | |
3219 static int | |
3220 window_to_frame_hpos (w, hpos) | |
3221 struct window *w; | |
3222 int hpos; | |
3223 { | |
3224 struct frame *f = XFRAME (w->frame); | |
3225 | |
3226 xassert (!FRAME_WINDOW_P (f)); | |
3227 hpos += XFASTINT (w->left); | |
3228 return hpos; | |
314 | 3229 } |
25012 | 3230 |
3231 #endif /* GLYPH_DEBUG */ | |
3232 | |
3233 | |
314 | 3234 |
25012 | 3235 /********************************************************************** |
3236 Redrawing Frames | |
3237 **********************************************************************/ | |
3238 | |
3239 DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0, | |
3240 "Clear frame FRAME and output again what is supposed to appear on it.") | |
3241 (frame) | |
3242 Lisp_Object frame; | |
3243 { | |
3244 struct frame *f; | |
3245 | |
3246 CHECK_LIVE_FRAME (frame, 0); | |
3247 f = XFRAME (frame); | |
3248 | |
3249 /* Ignore redraw requests, if frame has no glyphs yet. | |
3250 (Implementation note: It still has to be checked why we are | |
3251 called so early here). */ | |
3252 if (!glyphs_initialized_initially_p) | |
3253 return Qnil; | |
3254 | |
3255 update_begin (f); | |
35006
670f8ab148ea
(Fredraw_frame): Call set_terminal_modes for
Andrew Innes <andrewi@gnu.org>
parents:
34944
diff
changeset
|
3256 if (FRAME_MSDOS_P (f) || FRAME_W32_CONSOLE_P (f)) |
25012 | 3257 set_terminal_modes (); |
3258 clear_frame (); | |
3259 clear_current_matrices (f); | |
3260 update_end (f); | |
3261 fflush (stdout); | |
3262 windows_or_buffers_changed++; | |
3263 /* Mark all windows as inaccurate, so that every window will have | |
3264 its redisplay done. */ | |
3265 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0); | |
3266 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
3267 f->garbaged = 0; | |
3268 return Qnil; | |
3269 } | |
3270 | |
3271 | |
3272 /* Redraw frame F. This is nothing more than a call to the Lisp | |
3273 function redraw-frame. */ | |
3274 | |
3275 void | |
3276 redraw_frame (f) | |
3277 struct frame *f; | |
3278 { | |
3279 Lisp_Object frame; | |
3280 XSETFRAME (frame, f); | |
3281 Fredraw_frame (frame); | |
3282 } | |
3283 | |
3284 | |
3285 DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "", | |
3286 "Clear and redisplay all visible frames.") | |
3287 () | |
3288 { | |
3289 Lisp_Object tail, frame; | |
3290 | |
3291 FOR_EACH_FRAME (tail, frame) | |
3292 if (FRAME_VISIBLE_P (XFRAME (frame))) | |
3293 Fredraw_frame (frame); | |
3294 | |
3295 return Qnil; | |
3296 } | |
3297 | |
3298 | |
3299 /* This is used when frame_garbaged is set. Call Fredraw_frame on all | |
3300 visible frames marked as garbaged. */ | |
3301 | |
3302 void | |
3303 redraw_garbaged_frames () | |
3304 { | |
3305 Lisp_Object tail, frame; | |
3306 | |
3307 FOR_EACH_FRAME (tail, frame) | |
3308 if (FRAME_VISIBLE_P (XFRAME (frame)) | |
3309 && FRAME_GARBAGED_P (XFRAME (frame))) | |
3310 Fredraw_frame (frame); | |
3311 } | |
3312 | |
3313 | |
3314 | |
3315 /*********************************************************************** | |
3316 Direct Operations | |
3317 ***********************************************************************/ | |
3318 | |
3319 /* Try to update display and current glyph matrix directly. | |
3320 | |
3321 This function is called after a character G has been inserted into | |
3322 current_buffer. It tries to update the current glyph matrix and | |
3323 perform appropriate screen output to reflect the insertion. If it | |
3324 succeeds, the global flag redisplay_performed_directly_p will be | |
3325 set to 1, and thereby prevent the more costly general redisplay | |
3326 from running (see redisplay_internal). | |
3327 | |
3328 This function is not called for `hairy' character insertions. | |
3329 In particular, it is not called when after or before change | |
3330 functions exist, like they are used by font-lock. See keyboard.c | |
3331 for details where this function is called. */ | |
314 | 3332 |
3333 int | |
3334 direct_output_for_insert (g) | |
3335 int g; | |
3336 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3337 register struct frame *f = SELECTED_FRAME (); |
25012 | 3338 struct window *w = XWINDOW (selected_window); |
3339 struct it it, it2; | |
3340 struct glyph_row *glyph_row; | |
3341 struct glyph *glyphs, *glyph, *end; | |
3342 int n; | |
3343 /* Non-null means that Redisplay of W is based on window matrices. */ | |
3344 int window_redisplay_p = FRAME_WINDOW_P (f); | |
3345 /* Non-null means we are in overwrite mode. */ | |
3346 int overwrite_p = !NILP (current_buffer->overwrite_mode); | |
3347 int added_width; | |
3348 struct text_pos pos; | |
3349 int delta, delta_bytes; | |
3350 | |
3351 /* Not done directly. */ | |
3352 redisplay_performed_directly_p = 0; | |
3353 | |
3354 /* Quickly give up for some common cases. */ | |
3355 if (cursor_in_echo_area | |
3356 /* Give up if fonts have changed. */ | |
3357 || fonts_changed_p | |
3358 /* Give up if face attributes have been changed. */ | |
3359 || face_change_count | |
3360 /* Give up if cursor position not really known. */ | |
314 | 3361 || !display_completed |
25012 | 3362 /* Give up if buffer appears in two places. */ |
314 | 3363 || buffer_shared > 1 |
34715
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3364 /* Give up if currently displaying a message instead of the |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3365 minibuffer contents. */ |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3366 || (EQ (selected_window, minibuf_window) |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3367 && EQ (minibuf_window, echo_area_window)) |
25012 | 3368 /* Give up for hscrolled mini-buffer because display of the prompt |
3369 is handled specially there (see display_line). */ | |
3370 || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll)) | |
3371 /* Give up if overwriting in the middle of a line. */ | |
3372 || (overwrite_p | |
3373 && PT != ZV | |
3374 && FETCH_BYTE (PT) != '\n') | |
3375 /* Give up for tabs and line ends. */ | |
3376 || g == '\t' | |
3377 || g == '\n' | |
3378 || g == '\r' | |
3379 /* Give up if unable to display the cursor in the window. */ | |
3380 || w->cursor.vpos < 0 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3381 || (glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos), |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3382 /* Can't do it in a continued line because continuation |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3383 lines would change. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3384 (glyph_row->continued_p |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3385 /* Can't use this method if the line overlaps others or is |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3386 overlapped by others because these other lines would |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3387 have to be redisplayed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3388 || glyph_row->overlapping_p |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3389 || glyph_row->overlapped_p)) |
25012 | 3390 /* Can't do it for partial width windows on terminal frames |
3391 because we can't clear to eol in such a window. */ | |
3392 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w))) | |
3393 return 0; | |
3394 | |
3395 /* Set up a display iterator structure for W. Glyphs will be | |
3396 produced in scratch_glyph_row. Current position is W's cursor | |
3397 position. */ | |
3398 clear_glyph_row (&scratch_glyph_row); | |
3399 SET_TEXT_POS (pos, PT, PT_BYTE); | |
28361
eccb57c44da5
(direct_output_for_insert): Use DEC_TEXT_POS
Gerd Moellmann <gerd@gnu.org>
parents:
27968
diff
changeset
|
3400 DEC_TEXT_POS (pos, !NILP (current_buffer->enable_multibyte_characters)); |
25012 | 3401 init_iterator (&it, w, CHARPOS (pos), BYTEPOS (pos), &scratch_glyph_row, |
3402 DEFAULT_FACE_ID); | |
3403 | |
3404 glyph_row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3405 if (glyph_row->mouse_face_p) |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3406 return 0; |
25012 | 3407 |
3408 /* Give up if highlighting trailing whitespace and we have trailing | |
3409 whitespace in glyph_row. We would have to remove the trailing | |
3410 whitespace face in that case. */ | |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3411 if (!NILP (Vshow_trailing_whitespace) |
25012 | 3412 && glyph_row->used[TEXT_AREA]) |
3413 { | |
3414 struct glyph *last; | |
3415 | |
3416 last = glyph_row->glyphs[TEXT_AREA] + glyph_row->used[TEXT_AREA] - 1; | |
3417 if (last->type == STRETCH_GLYPH | |
3418 || (last->type == CHAR_GLYPH | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
3419 && last->u.ch == ' ')) |
25012 | 3420 return 0; |
3421 } | |
3422 | |
3423 /* Give up if there are overlay strings at pos. This would fail | |
3424 if the overlay string has newlines in it. */ | |
3425 if (STRINGP (it.string)) | |
3426 return 0; | |
3427 | |
3428 it.hpos = w->cursor.hpos; | |
3429 it.vpos = w->cursor.vpos; | |
3430 it.current_x = w->cursor.x + it.first_visible_x; | |
3431 it.current_y = w->cursor.y; | |
3432 it.end_charpos = PT; | |
3433 it.stop_charpos = min (PT, it.stop_charpos); | |
3434 | |
3435 /* More than one display element may be returned for PT - 1 if | |
3436 (i) it's a control character which is translated into `\003' or | |
3437 `^C', or (ii) it has a display table entry, or (iii) it's a | |
3438 combination of both. */ | |
3439 delta = delta_bytes = 0; | |
3440 while (get_next_display_element (&it)) | |
3441 { | |
3442 PRODUCE_GLYPHS (&it); | |
3443 | |
3444 /* Give up if glyph doesn't fit completely on the line. */ | |
3445 if (it.current_x >= it.last_visible_x) | |
3446 return 0; | |
3447 | |
3448 /* Give up if new glyph has different ascent or descent than | |
3449 the original row, or if it is not a character glyph. */ | |
3450 if (glyph_row->ascent != it.ascent | |
3451 || glyph_row->height != it.ascent + it.descent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3452 || glyph_row->phys_ascent != it.phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3453 || glyph_row->phys_height != it.phys_ascent + it.phys_descent |
25012 | 3454 || it.what != IT_CHARACTER) |
3455 return 0; | |
3456 | |
3457 delta += 1; | |
3458 delta_bytes += it.len; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3459 set_iterator_to_next (&it, 1); |
25012 | 3460 } |
3461 | |
3462 /* Give up if we hit the right edge of the window. We would have | |
3463 to insert truncation or continuation glyphs. */ | |
3464 added_width = it.current_x - (w->cursor.x + it.first_visible_x); | |
3465 if (glyph_row->pixel_width + added_width >= it.last_visible_x) | |
314 | 3466 return 0; |
3467 | |
25012 | 3468 /* Give up if there is a \t following in the line. */ |
3469 it2 = it; | |
3470 it2.end_charpos = ZV; | |
3471 it2.stop_charpos = min (it2.stop_charpos, ZV); | |
3472 while (get_next_display_element (&it2) | |
3473 && !ITERATOR_AT_END_OF_LINE_P (&it2)) | |
3474 { | |
3475 if (it2.c == '\t') | |
3476 return 0; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3477 set_iterator_to_next (&it2, 1); |
25012 | 3478 } |
3479 | |
3480 /* Number of new glyphs produced. */ | |
3481 n = it.glyph_row->used[TEXT_AREA]; | |
3482 | |
3483 /* Start and end of glyphs in original row. */ | |
3484 glyphs = glyph_row->glyphs[TEXT_AREA] + w->cursor.hpos; | |
3485 end = glyph_row->glyphs[1 + TEXT_AREA]; | |
3486 | |
3487 /* Make room for new glyphs, then insert them. */ | |
3488 xassert (end - glyphs - n >= 0); | |
25781
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3489 safe_bcopy ((char *) glyphs, (char *) (glyphs + n), |
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3490 (end - glyphs - n) * sizeof (*end)); |
25012 | 3491 bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs); |
3492 glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n, | |
3493 end - glyph_row->glyphs[TEXT_AREA]); | |
3494 | |
3495 /* Compute new line width. */ | |
3496 glyph = glyph_row->glyphs[TEXT_AREA]; | |
3497 end = glyph + glyph_row->used[TEXT_AREA]; | |
3498 glyph_row->pixel_width = glyph_row->x; | |
3499 while (glyph < end) | |
3500 { | |
3501 glyph_row->pixel_width += glyph->pixel_width; | |
3502 ++glyph; | |
3503 } | |
3504 | |
3505 /* Increment buffer positions for glyphs following the newly | |
3506 inserted ones. */ | |
3507 for (glyph = glyphs + n; glyph < end; ++glyph) | |
26546
0f43cc91d6a5
(direct_output_for_insert): Increment glyph positions
Gerd Moellmann <gerd@gnu.org>
parents:
26499
diff
changeset
|
3508 if (glyph->charpos > 0 && BUFFERP (glyph->object)) |
25012 | 3509 glyph->charpos += delta; |
3510 | |
3511 if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0) | |
3512 { | |
3513 MATRIX_ROW_END_CHARPOS (glyph_row) += delta; | |
3514 MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes; | |
3515 } | |
3516 | |
3517 /* Adjust positions in lines following the one we are in. */ | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3518 increment_matrix_positions (w->current_matrix, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3519 w->cursor.vpos + 1, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3520 w->current_matrix->nrows, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3521 delta, delta_bytes); |
25012 | 3522 |
3523 glyph_row->contains_overlapping_glyphs_p | |
3524 |= it.glyph_row->contains_overlapping_glyphs_p; | |
3525 | |
26591
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3526 glyph_row->displays_text_p = 1; |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3527 w->window_end_vpos = make_number (max (w->cursor.vpos, |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3528 XFASTINT (w->window_end_vpos))); |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3529 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3530 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 3531 highlight_trailing_whitespace (it.f, glyph_row); |
3532 | |
3533 /* Write glyphs. If at end of row, we can simply call write_glyphs. | |
3534 In the middle, we have to insert glyphs. Note that this is now | |
3535 implemented for X frames. The implementation uses updated_window | |
3536 and updated_row. */ | |
3537 updated_row = glyph_row; | |
3538 update_begin (f); | |
3539 if (rif) | |
3540 { | |
3541 rif->update_window_begin_hook (w); | |
3542 | |
3543 if (glyphs == end - n) | |
3544 rif->write_glyphs (glyphs, n); | |
3545 else | |
3546 rif->insert_glyphs (glyphs, n); | |
3547 } | |
3548 else | |
3549 { | |
3550 if (glyphs == end - n) | |
3551 write_glyphs (glyphs, n); | |
3552 else | |
3553 insert_glyphs (glyphs, n); | |
3554 } | |
3555 | |
3556 w->cursor.hpos += n; | |
3557 w->cursor.x = it.current_x - it.first_visible_x; | |
3558 xassert (w->cursor.hpos >= 0 | |
3559 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
3560 | |
3561 /* How to set the cursor differs depending on whether we are | |
3562 using a frame matrix or a window matrix. Note that when | |
3563 a frame matrix is used, cursor_to expects frame coordinates, | |
3564 and the X and Y parameters are not used. */ | |
3565 if (window_redisplay_p) | |
3566 rif->cursor_to (w->cursor.vpos, w->cursor.hpos, | |
3567 w->cursor.y, w->cursor.x); | |
3568 else | |
3569 { | |
3570 int x, y; | |
3571 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos) | |
3572 + (INTEGERP (w->left_margin_width) | |
3573 ? XFASTINT (w->left_margin_width) | |
3574 : 0)); | |
3575 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
3576 cursor_to (y, x); | |
3577 } | |
3578 | |
3579 if (rif) | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3580 rif->update_window_end_hook (w, 1, 0); |
25012 | 3581 update_end (f); |
3582 updated_row = NULL; | |
3583 fflush (stdout); | |
3584 | |
3585 TRACE ((stderr, "direct output for insert\n")); | |
3586 | |
25372
acf281b41a38
(direct_output_for_insert): Set beg_unchanged
Gerd Moellmann <gerd@gnu.org>
parents:
25345
diff
changeset
|
3587 UNCHANGED_MODIFIED = MODIFF; |
acf281b41a38
(direct_output_for_insert): Set beg_unchanged
Gerd Moellmann <gerd@gnu.org>
parents:
25345
diff
changeset
|
3588 BEG_UNCHANGED = GPT - BEG; |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15896
diff
changeset
|
3589 XSETFASTINT (w->last_point, PT); |
25012 | 3590 w->last_cursor = w->cursor; |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
3591 XSETFASTINT (w->last_modified, MODIFF); |
16195
e15e4bdcb8cc
(direct_output_for_insert): Set last_overlay_modified field in window.
Richard M. Stallman <rms@gnu.org>
parents:
16051
diff
changeset
|
3592 XSETFASTINT (w->last_overlay_modified, OVERLAY_MODIFF); |
314 | 3593 |
25012 | 3594 redisplay_performed_directly_p = 1; |
314 | 3595 return 1; |
3596 } | |
3597 | |
25012 | 3598 |
3599 /* Perform a direct display update for moving PT by N positions | |
3600 left or right. N < 0 means a movement backwards. This function | |
3601 is currently only called for N == 1 or N == -1. */ | |
3602 | |
314 | 3603 int |
3604 direct_output_forward_char (n) | |
3605 int n; | |
3606 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3607 struct frame *f = SELECTED_FRAME (); |
25012 | 3608 struct window *w = XWINDOW (selected_window); |
3609 struct glyph_row *row; | |
3610 | |
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3611 /* Give up if point moved out of or into a composition. */ |
28507
b6f06a755c7d
make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents:
28361
diff
changeset
|
3612 if (check_point_in_composition (current_buffer, XINT (w->last_point), |
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3613 current_buffer, PT)) |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3614 return 0; |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3615 |
25012 | 3616 /* Give up if face attributes have been changed. */ |
3617 if (face_change_count) | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
3618 return 0; |
25012 | 3619 |
3620 /* Give up if current matrix is not up to date or we are | |
3621 displaying a message. */ | |
3622 if (!display_completed || cursor_in_echo_area) | |
3623 return 0; | |
3624 | |
3625 /* Give up if the buffer's direction is reversed. */ | |
3626 if (!NILP (XBUFFER (w->buffer)->direction_reversed)) | |
314 | 3627 return 0; |
11096
cac0367b1794
(direct_output_forward_char): Don't use direct output at an overlay boundary.
Karl Heuer <kwzh@gnu.org>
parents:
10770
diff
changeset
|
3628 |
2794
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3629 /* Can't use direct output if highlighting a region. */ |
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3630 if (!NILP (Vtransient_mark_mode) && !NILP (current_buffer->mark_active)) |
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3631 return 0; |
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3632 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3633 /* Can't use direct output if highlighting trailing whitespace. */ |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3634 if (!NILP (Vshow_trailing_whitespace)) |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3635 return 0; |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3636 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3637 /* Give up if we are showing a message or just cleared the message |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3638 because we might need to resize the echo area window. */ |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3639 if (!NILP (echo_area_buffer[0]) || !NILP (echo_area_buffer[1])) |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3640 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3641 |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3642 /* Give up if currently displaying a message instead of the |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3643 minibuffer contents. */ |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3644 if (XWINDOW (minibuf_window) == w |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3645 && EQ (minibuf_window, echo_area_window)) |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3646 return 0; |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3647 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3648 /* Give up if we don't know where the cursor is. */ |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3649 if (w->cursor.vpos < 0) |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3650 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3651 |
25012 | 3652 row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); |
3653 | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
3654 /* Give up if PT is outside of the last known cursor row. */ |
25012 | 3655 if (PT <= MATRIX_ROW_START_BYTEPOS (row) |
3656 || PT >= MATRIX_ROW_END_BYTEPOS (row)) | |
6069
07045ca8ff19
(direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
6068
diff
changeset
|
3657 return 0; |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
3658 |
25012 | 3659 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
3660 |
25012 | 3661 w->last_cursor = w->cursor; |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15896
diff
changeset
|
3662 XSETFASTINT (w->last_point, PT); |
25012 | 3663 |
3664 xassert (w->cursor.hpos >= 0 | |
3665 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
3666 | |
3667 if (FRAME_WINDOW_P (f)) | |
3668 rif->cursor_to (w->cursor.vpos, w->cursor.hpos, | |
3669 w->cursor.y, w->cursor.x); | |
3670 else | |
3671 { | |
3672 int x, y; | |
3673 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos) | |
3674 + (INTEGERP (w->left_margin_width) | |
3675 ? XFASTINT (w->left_margin_width) | |
3676 : 0)); | |
3677 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
3678 cursor_to (y, x); | |
3679 } | |
3680 | |
314 | 3681 fflush (stdout); |
25012 | 3682 redisplay_performed_directly_p = 1; |
314 | 3683 return 1; |
3684 } | |
25012 | 3685 |
3686 | |
314 | 3687 |
25012 | 3688 /*********************************************************************** |
3689 Frame Update | |
3690 ***********************************************************************/ | |
3691 | |
3692 /* Update frame F based on the data in desired matrices. | |
3693 | |
3694 If FORCE_P is non-zero, don't let redisplay be stopped by detecting | |
3695 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try | |
3696 scrolling. | |
3697 | |
3698 Value is non-zero if redisplay was stopped due to pending input. */ | |
314 | 3699 |
3700 int | |
25012 | 3701 update_frame (f, force_p, inhibit_hairy_id_p) |
3702 struct frame *f; | |
3703 int force_p; | |
3704 int inhibit_hairy_id_p; | |
3705 { | |
3706 /* 1 means display has been paused because of pending input. */ | |
3707 int paused_p; | |
3708 struct window *root_window = XWINDOW (f->root_window); | |
3709 | |
3710 if (FRAME_WINDOW_P (f)) | |
3711 { | |
3712 /* We are working on window matrix basis. All windows whose | |
3713 flag must_be_updated_p is set have to be updated. */ | |
3714 | |
3715 /* Record that we are not working on frame matrices. */ | |
3716 set_frame_matrix_frame (NULL); | |
3717 | |
3718 /* Update all windows in the window tree of F, maybe stopping | |
3719 when pending input is detected. */ | |
3720 update_begin (f); | |
3721 | |
3722 /* Update the menu bar on X frames that don't have toolkit | |
3723 support. */ | |
3724 if (WINDOWP (f->menu_bar_window)) | |
3725 update_window (XWINDOW (f->menu_bar_window), 1); | |
3726 | |
3727 /* Update the tool-bar window, if present. */ | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3728 if (WINDOWP (f->tool_bar_window)) |
25012 | 3729 { |
3730 Lisp_Object tem; | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3731 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 3732 |
3733 /* Update tool-bar window. */ | |
3734 if (w->must_be_updated_p) | |
3735 { | |
3736 update_window (w, 1); | |
3737 w->must_be_updated_p = 0; | |
3738 | |
3739 /* Swap tool-bar strings. We swap because we want to | |
3740 reuse strings. */ | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3741 tem = f->current_tool_bar_string; |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3742 f->current_tool_bar_string = f->desired_tool_bar_string; |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3743 f->desired_tool_bar_string = tem; |
25012 | 3744 } |
3745 } | |
3746 | |
3747 | |
3748 /* Update windows. */ | |
3749 paused_p = update_window_tree (root_window, force_p); | |
3750 update_end (f); | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3751 |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3752 #if 0 /* This flush is a performance bottleneck under X, |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3753 and it doesn't seem to be necessary anyway. */ |
25012 | 3754 rif->flush_display (f); |
3755 #endif | |
3756 } | |
3757 else | |
3758 { | |
3759 /* We are working on frame matrix basis. Set the frame on whose | |
3760 frame matrix we operate. */ | |
3761 set_frame_matrix_frame (f); | |
3762 | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3763 /* Build F's desired matrix from window matrices. */ |
25012 | 3764 build_frame_matrix (f); |
3765 | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3766 /* Update the display */ |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3767 update_begin (f); |
25012 | 3768 paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p); |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3769 update_end (f); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3770 |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3771 if (termscript) |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3772 fflush (termscript); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3773 fflush (stdout); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3774 |
25012 | 3775 /* Check window matrices for lost pointers. */ |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
3776 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3777 check_window_matrix_pointers (root_window); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3778 add_frame_display_history (f, paused_p); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3779 #endif |
25012 | 3780 } |
3781 | |
3782 /* Reset flags indicating that a window should be updated. */ | |
3783 set_window_update_flags (root_window, 0); | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3784 |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3785 display_completed = !paused_p; |
25012 | 3786 return paused_p; |
3787 } | |
3788 | |
3789 | |
3790 | |
3791 /************************************************************************ | |
3792 Window-based updates | |
3793 ************************************************************************/ | |
3794 | |
3795 /* Perform updates in window tree rooted at W. FORCE_P non-zero means | |
3796 don't stop updating when input is pending. */ | |
3797 | |
3798 static int | |
3799 update_window_tree (w, force_p) | |
3800 struct window *w; | |
3801 int force_p; | |
3802 { | |
3803 int paused_p = 0; | |
3804 | |
3805 while (w && !paused_p) | |
3806 { | |
3807 if (!NILP (w->hchild)) | |
3808 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p); | |
3809 else if (!NILP (w->vchild)) | |
3810 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p); | |
3811 else if (w->must_be_updated_p) | |
3812 paused_p |= update_window (w, force_p); | |
3813 | |
3814 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3815 } | |
3816 | |
3817 return paused_p; | |
3818 } | |
3819 | |
3820 | |
3821 /* Update window W if its flag must_be_updated_p is non-zero. If | |
3822 FORCE_P is non-zero, don't stop updating if input is pending. */ | |
3823 | |
3824 void | |
3825 update_single_window (w, force_p) | |
3826 struct window *w; | |
3827 int force_p; | |
3828 { | |
3829 if (w->must_be_updated_p) | |
3830 { | |
3831 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
3832 | |
3833 /* Record that this is not a frame-based redisplay. */ | |
3834 set_frame_matrix_frame (NULL); | |
3835 | |
3836 /* Update W. */ | |
3837 update_begin (f); | |
3838 update_window (w, force_p); | |
3839 update_end (f); | |
3840 | |
3841 /* Reset flag in W. */ | |
3842 w->must_be_updated_p = 0; | |
3843 } | |
3844 } | |
3845 | |
3846 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3847 /* Redraw lines from the current matrix of window W that are |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3848 overlapped by other rows. YB is bottom-most y-position in W. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3849 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3850 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3851 redraw_overlapped_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3852 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3853 int yb; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3854 { |
30165
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
3855 int i; |
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
3856 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3857 /* If rows overlapping others have been changed, the rows being |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3858 overlapped have to be redrawn. This won't draw lines that have |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3859 already been drawn in update_window_line because overlapped_p in |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3860 desired rows is 0, so after row assignment overlapped_p in |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3861 current rows is 0. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3862 for (i = 0; i < w->current_matrix->nrows; ++i) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3863 { |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3864 struct glyph_row *row = w->current_matrix->rows + i; |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3865 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3866 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3867 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3868 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3869 continue; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3870 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3871 if (row->overlapped_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3872 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3873 enum glyph_row_area area; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3874 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3875 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3876 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3877 updated_row = row; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3878 updated_area = area; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3879 rif->cursor_to (i, 0, row->y, area == TEXT_AREA ? row->x : 0); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3880 if (row->used[area]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3881 rif->write_glyphs (row->glyphs[area], row->used[area]); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3882 rif->clear_end_of_line (-1); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3883 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3884 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3885 row->overlapped_p = 0; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3886 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3887 |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3888 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3889 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3890 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3891 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3892 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3893 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3894 /* Redraw lines from the current matrix of window W that overlap |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3895 others. YB is bottom-most y-position in W. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3896 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3897 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3898 redraw_overlapping_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3899 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3900 int yb; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3901 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3902 int i, bottom_y; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3903 struct glyph_row *row; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3904 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3905 for (i = 0; i < w->current_matrix->nrows; ++i) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3906 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3907 row = w->current_matrix->rows + i; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3908 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3909 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3910 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3911 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3912 continue; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3913 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3914 bottom_y = MATRIX_ROW_BOTTOM_Y (row); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3915 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3916 if (row->overlapping_p && i > 0 && bottom_y < yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3917 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3918 if (row->used[LEFT_MARGIN_AREA]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3919 rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3920 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3921 if (row->used[TEXT_AREA]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3922 rif->fix_overlapping_area (w, row, TEXT_AREA); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3923 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3924 if (row->used[RIGHT_MARGIN_AREA]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3925 rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3926 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3927 /* Record in neighbor rows that ROW overwrites part of their |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3928 display. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3929 if (row->phys_ascent > row->ascent && i > 0) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3930 MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3931 if ((row->phys_height - row->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3932 > row->height - row->ascent) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3933 && bottom_y < yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3934 MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3935 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3936 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3937 if (bottom_y >= yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3938 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3939 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3940 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3941 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3942 |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3943 #ifdef GLYPH_DEBUG |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3944 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3945 /* Check that no row in the current matrix of window W is enabled |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3946 which is below what's displayed in the window. */ |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3947 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3948 void |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3949 check_current_matrix_flags (w) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3950 struct window *w; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3951 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3952 int last_seen_p = 0; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3953 int i, yb = window_text_bottom_y (w); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3954 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3955 for (i = 0; i < w->current_matrix->nrows - 1; ++i) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3956 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3957 struct glyph_row *row = MATRIX_ROW (w->current_matrix, i); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3958 if (!last_seen_p && MATRIX_ROW_BOTTOM_Y (row) >= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3959 last_seen_p = 1; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3960 else if (last_seen_p && row->enabled_p) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3961 abort (); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3962 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3963 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3964 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3965 #endif /* GLYPH_DEBUG */ |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3966 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3967 |
25012 | 3968 /* Update display of window W. FORCE_P non-zero means that we should |
3969 not stop when detecting pending input. */ | |
3970 | |
3971 static int | |
3972 update_window (w, force_p) | |
3973 struct window *w; | |
3974 int force_p; | |
3975 { | |
3976 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
3977 int paused_p; | |
3978 int preempt_count = baud_rate / 2400 + 1; | |
3979 extern int input_pending; | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
3980 extern Lisp_Object do_mouse_tracking; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
3981 #if GLYPH_DEBUG |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
3982 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
25012 | 3983 extern struct frame *updating_frame; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
3984 #endif |
25012 | 3985 |
3986 /* Check that W's frame doesn't have glyph matrices. */ | |
3987 xassert (FRAME_WINDOW_P (f)); | |
3988 xassert (updating_frame != NULL); | |
3989 | |
3990 /* Check pending input the first time so that we can quickly return. */ | |
3991 if (redisplay_dont_pause) | |
3992 force_p = 1; | |
3993 else | |
3994 detect_input_pending (); | |
3995 | |
3996 /* If forced to complete the update, or if no input is pending, do | |
3997 the update. */ | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
3998 if (force_p || !input_pending || !NILP (do_mouse_tracking)) |
25012 | 3999 { |
4000 struct glyph_row *row, *end; | |
4001 struct glyph_row *mode_line_row; | |
25546 | 4002 struct glyph_row *header_line_row = NULL; |
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
4003 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated; |
25012 | 4004 |
4005 rif->update_window_begin_hook (w); | |
4006 yb = window_text_bottom_y (w); | |
4007 | |
4008 /* If window has a top line, update it before everything else. | |
4009 Adjust y-positions of other rows by the top line height. */ | |
4010 row = desired_matrix->rows; | |
4011 end = row + desired_matrix->nrows - 1; | |
4012 if (row->mode_line_p) | |
25546 | 4013 header_line_row = row++; |
25012 | 4014 |
4015 /* Update the mode line, if necessary. */ | |
4016 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix); | |
4017 if (mode_line_row->mode_line_p && mode_line_row->enabled_p) | |
4018 { | |
4019 mode_line_row->y = yb; | |
4020 update_window_line (w, MATRIX_ROW_VPOS (mode_line_row, | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4021 desired_matrix), |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4022 &mouse_face_overwritten_p); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4023 changed_p = 1; |
25012 | 4024 } |
4025 | |
4026 /* Find first enabled row. Optimizations in redisplay_internal | |
4027 may lead to an update with only one row enabled. There may | |
4028 be also completely empty matrices. */ | |
4029 while (row < end && !row->enabled_p) | |
4030 ++row; | |
4031 | |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4032 /* Try reusing part of the display by copying. */ |
25012 | 4033 if (row < end && !desired_matrix->no_scrolling_p) |
4034 { | |
25546 | 4035 int rc = scrolling_window (w, header_line_row != NULL); |
25012 | 4036 if (rc < 0) |
4037 { | |
4038 /* All rows were found to be equal. */ | |
4039 paused_p = 0; | |
4040 goto set_cursor; | |
4041 } | |
4042 else if (rc > 0) | |
4043 force_p = 1; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4044 changed_p = 1; |
25012 | 4045 } |
4046 | |
4047 /* Update the top mode line after scrolling because a new top | |
4048 line would otherwise overwrite lines at the top of the window | |
4049 that can be scrolled. */ | |
25546 | 4050 if (header_line_row && header_line_row->enabled_p) |
25012 | 4051 { |
25546 | 4052 header_line_row->y = 0; |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4053 update_window_line (w, 0, &mouse_face_overwritten_p); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4054 changed_p = 1; |
25012 | 4055 } |
4056 | |
4057 /* Update the rest of the lines. */ | |
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
4058 for (n_updated = 0; row < end && (force_p || !input_pending); ++row) |
31653
2554afbeb88d
(update_window): Make sure to make desired rows
Gerd Moellmann <gerd@gnu.org>
parents:
31295
diff
changeset
|
4059 if (row->enabled_p) |
25012 | 4060 { |
4061 int vpos = MATRIX_ROW_VPOS (row, desired_matrix); | |
4062 int i; | |
4063 | |
4064 /* We'll Have to play a little bit with when to | |
4065 detect_input_pending. If it's done too often, | |
4066 scrolling large windows with repeated scroll-up | |
4067 commands will too quickly pause redisplay. */ | |
34622
877ed6cab304
(update_window): Detect pending input every nth line
Gerd Moellmann <gerd@gnu.org>
parents:
34517
diff
changeset
|
4068 if (!force_p && ++n_updated % preempt_count == 0) |
25012 | 4069 detect_input_pending (); |
4070 | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4071 changed_p |= update_window_line (w, vpos, |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4072 &mouse_face_overwritten_p); |
25012 | 4073 |
4074 /* Mark all rows below the last visible one in the current | |
4075 matrix as invalid. This is necessary because of | |
4076 variable line heights. Consider the case of three | |
4077 successive redisplays, where the first displays 5 | |
4078 lines, the second 3 lines, and the third 5 lines again. | |
4079 If the second redisplay wouldn't mark rows in the | |
4080 current matrix invalid, the third redisplay might be | |
4081 tempted to optimize redisplay based on lines displayed | |
4082 in the first redisplay. */ | |
4083 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
4084 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i) | |
4085 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
4086 } | |
4087 | |
4088 /* Was display preempted? */ | |
4089 paused_p = row < end; | |
4090 | |
4091 set_cursor: | |
4092 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4093 /* Fix the appearance of overlapping(overlapped rows. */ |
25012 | 4094 if (!paused_p && !w->pseudo_window_p) |
4095 { | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4096 if (changed_p && rif->fix_overlapping_area) |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4097 { |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4098 redraw_overlapped_rows (w, yb); |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4099 redraw_overlapping_rows (w, yb); |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4100 } |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4101 |
25012 | 4102 /* Make cursor visible at cursor position of W. */ |
4103 set_window_cursor_after_update (w); | |
4104 | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4105 #if 0 /* Check that current matrix invariants are satisfied. This is |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4106 for debugging only. See the comment of check_matrix_invariants. */ |
25012 | 4107 IF_DEBUG (check_matrix_invariants (w)); |
4108 #endif | |
4109 } | |
4110 | |
4111 #if GLYPH_DEBUG | |
4112 /* Remember the redisplay method used to display the matrix. */ | |
4113 strcpy (w->current_matrix->method, w->desired_matrix->method); | |
4114 #endif | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4115 |
25012 | 4116 /* End of update of window W. */ |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4117 rif->update_window_end_hook (w, 1, mouse_face_overwritten_p); |
25012 | 4118 } |
4119 else | |
4120 paused_p = 1; | |
4121 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
4122 #if GLYPH_DEBUG |
34944
4fc804373f2a
(update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents:
34929
diff
changeset
|
4123 /* check_current_matrix_flags (w); */ |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4124 add_window_display_history (w, w->current_matrix->method, paused_p); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4125 #endif |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4126 |
25012 | 4127 clear_glyph_matrix (desired_matrix); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4128 |
25012 | 4129 return paused_p; |
4130 } | |
4131 | |
4132 | |
4133 /* Update the display of area AREA in window W, row number VPOS. | |
4134 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */ | |
4135 | |
4136 static void | |
4137 update_marginal_area (w, area, vpos) | |
4138 struct window *w; | |
4139 int area, vpos; | |
4140 { | |
4141 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
4142 | |
4143 /* Let functions in xterm.c know what area subsequent X positions | |
4144 will be relative to. */ | |
4145 updated_area = area; | |
4146 | |
4147 /* Set cursor to start of glyphs, write them, and clear to the end | |
4148 of the area. I don't think that something more sophisticated is | |
4149 necessary here, since marginal areas will not be the default. */ | |
4150 rif->cursor_to (vpos, 0, desired_row->y, 0); | |
4151 if (desired_row->used[area]) | |
4152 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]); | |
4153 rif->clear_end_of_line (-1); | |
4154 } | |
4155 | |
4156 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4157 /* Update the display of the text area of row VPOS in window W. |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4158 Value is non-zero if display has changed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4159 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4160 static int |
25012 | 4161 update_text_area (w, vpos) |
4162 struct window *w; | |
4163 int vpos; | |
314 | 4164 { |
25012 | 4165 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); |
4166 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4167 int changed_p = 0; |
25012 | 4168 |
4169 /* Let functions in xterm.c know what area subsequent X positions | |
4170 will be relative to. */ | |
4171 updated_area = TEXT_AREA; | |
4172 | |
4173 /* If rows are at different X or Y, or rows have different height, | |
4174 or the current row is marked invalid, write the entire line. */ | |
4175 if (!current_row->enabled_p | |
4176 || desired_row->y != current_row->y | |
4177 || desired_row->ascent != current_row->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4178 || desired_row->phys_ascent != current_row->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4179 || desired_row->phys_height != current_row->phys_height |
25012 | 4180 || desired_row->visible_height != current_row->visible_height |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4181 || current_row->overlapped_p |
30307
faf4e303bab7
(update_text_area): Write the whole row if it
Gerd Moellmann <gerd@gnu.org>
parents:
30165
diff
changeset
|
4182 || current_row->mouse_face_p |
25012 | 4183 || current_row->x != desired_row->x) |
4184 { | |
4185 rif->cursor_to (vpos, 0, desired_row->y, desired_row->x); | |
4186 | |
4187 if (desired_row->used[TEXT_AREA]) | |
4188 rif->write_glyphs (desired_row->glyphs[TEXT_AREA], | |
4189 desired_row->used[TEXT_AREA]); | |
4190 | |
4191 /* Clear to end of window. */ | |
4192 rif->clear_end_of_line (-1); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4193 changed_p = 1; |
25012 | 4194 } |
4195 else | |
4196 { | |
4197 int stop, i, x; | |
4198 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; | |
4199 struct glyph *desired_glyph = desired_row->glyphs[TEXT_AREA]; | |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4200 int overlapping_glyphs_p = current_row->contains_overlapping_glyphs_p; |
35268
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4201 int desired_stop_pos = desired_row->used[TEXT_AREA]; |
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4202 |
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4203 #if 0 /* This shouldn't be necessary. Let's check it. */ |
25012 | 4204 /* If the desired row extends its face to the text area end, |
4205 make sure we write at least one glyph, so that the face | |
4206 extension actually takes place. */ | |
35269 | 4207 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) |
35268
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4208 --desired_stop_pos; |
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4209 #endif |
25012 | 4210 |
4211 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); | |
4212 i = 0; | |
4213 x = desired_row->x; | |
4214 | |
4215 while (i < stop) | |
4216 { | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4217 int can_skip_p = 1; |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4218 |
25012 | 4219 /* Skip over glyphs that both rows have in common. These |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4220 don't have to be written. We can't skip if the last |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4221 current glyph overlaps the glyph to its right. For |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4222 example, consider a current row of `if ' with the `f' in |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4223 Courier bold so that it overlaps the ` ' to its right. |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4224 If the desired row is ` ', we would skip over the space |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4225 after the `if' and there would remain a pixel from the |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4226 `f' on the screen. */ |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4227 if (overlapping_glyphs_p && i > 0) |
25012 | 4228 { |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4229 struct glyph *glyph = ¤t_row->glyphs[TEXT_AREA][i - 1]; |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4230 int left, right; |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4231 |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4232 rif->get_glyph_overhangs (glyph, XFRAME (w->frame), |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4233 &left, &right); |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4234 can_skip_p = right == 0; |
25012 | 4235 } |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4236 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4237 if (can_skip_p) |
25012 | 4238 { |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4239 while (i < stop |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4240 && GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4241 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4242 x += desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4243 ++desired_glyph, ++current_glyph, ++i; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4244 } |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4245 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4246 /* Consider the case that the current row contains "xxx |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4247 ppp ggg" in italic Courier font, and the desired row |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4248 is "xxx ggg". The character `p' has lbearing, `g' |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4249 has not. The loop above will stop in front of the |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4250 first `p' in the current row. If we would start |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4251 writing glyphs there, we wouldn't erase the lbearing |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4252 of the `p'. The rest of the lbearing problem is then |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4253 taken care of by x_draw_glyphs. */ |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4254 if (overlapping_glyphs_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4255 && i > 0 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4256 && i < current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4257 && (current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4258 != desired_row->used[TEXT_AREA])) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4259 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4260 int left, right; |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4261 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4262 rif->get_glyph_overhangs (current_glyph, XFRAME (w->frame), |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4263 &left, &right); |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4264 while (left > 0 && i > 0) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4265 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4266 --i, --desired_glyph, --current_glyph; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4267 x -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4268 left -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4269 } |
25012 | 4270 } |
4271 } | |
4272 | |
4273 /* Try to avoid writing the entire rest of the desired row | |
4274 by looking for a resync point. This mainly prevents | |
4275 mode line flickering in the case the mode line is in | |
4276 fixed-pitch font, which it usually will be. */ | |
4277 if (i < desired_row->used[TEXT_AREA]) | |
4278 { | |
4279 int start_x = x, start_hpos = i; | |
4280 struct glyph *start = desired_glyph; | |
4281 int current_x = x; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4282 int skip_first_p = !can_skip_p; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4283 |
25012 | 4284 /* Find the next glyph that's equal again. */ |
4285 while (i < stop | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4286 && (skip_first_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4287 || !GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
25012 | 4288 && x == current_x) |
4289 { | |
4290 x += desired_glyph->pixel_width; | |
4291 current_x += current_glyph->pixel_width; | |
4292 ++desired_glyph, ++current_glyph, ++i; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4293 skip_first_p = 0; |
25012 | 4294 } |
4295 | |
4296 if (i == start_hpos || x != current_x) | |
4297 { | |
4298 i = start_hpos; | |
4299 x = start_x; | |
4300 desired_glyph = start; | |
4301 break; | |
4302 } | |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4303 |
25012 | 4304 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x); |
4305 rif->write_glyphs (start, i - start_hpos); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4306 changed_p = 1; |
25012 | 4307 } |
4308 } | |
4309 | |
4310 /* Write the rest. */ | |
4311 if (i < desired_row->used[TEXT_AREA]) | |
4312 { | |
4313 rif->cursor_to (vpos, i, desired_row->y, x); | |
4314 rif->write_glyphs (desired_glyph, desired_row->used[TEXT_AREA] - i); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4315 changed_p = 1; |
25012 | 4316 } |
4317 | |
4318 /* Maybe clear to end of line. */ | |
4319 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) | |
4320 { | |
35268
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4321 #if 0 |
25012 | 4322 /* If new row extends to the end of the text area, nothing |
4323 has to be cleared, if and only if we did a write_glyphs | |
4324 above. This is made sure by setting desired_stop_pos | |
4325 appropriately above. */ | |
4326 xassert (i < desired_row->used[TEXT_AREA]); | |
35268
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4327 #endif |
25012 | 4328 } |
4329 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) | |
4330 { | |
4331 /* If old row extends to the end of the text area, clear. */ | |
4332 if (i >= desired_row->used[TEXT_AREA]) | |
4333 rif->cursor_to (vpos, i, desired_row->y, | |
4334 desired_row->x + desired_row->pixel_width); | |
4335 rif->clear_end_of_line (-1); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4336 changed_p = 1; |
25012 | 4337 } |
4338 else if (desired_row->pixel_width < current_row->pixel_width) | |
4339 { | |
4340 /* Otherwise clear to the end of the old row. Everything | |
4341 after that position should be clear already. */ | |
4342 int x; | |
4343 | |
4344 if (i >= desired_row->used[TEXT_AREA]) | |
4345 rif->cursor_to (vpos, i, desired_row->y, | |
4346 desired_row->x + desired_row->pixel_width); | |
4347 | |
4348 /* If cursor is displayed at the end of the line, make sure | |
4349 it's cleared. Nowadays we don't have a phys_cursor_glyph | |
4350 with which to erase the cursor (because this method | |
4351 doesn't work with lbearing/rbearing), so we must do it | |
4352 this way. */ | |
4353 if (vpos == w->phys_cursor.vpos | |
4354 && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA]) | |
4355 { | |
4356 w->phys_cursor_on_p = 0; | |
4357 x = -1; | |
4358 } | |
4359 else | |
4360 x = current_row->x + current_row->pixel_width; | |
4361 rif->clear_end_of_line (x); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4362 changed_p = 1; |
25012 | 4363 } |
4364 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4365 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4366 return changed_p; |
25012 | 4367 } |
4368 | |
4369 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4370 /* Update row VPOS in window W. Value is non-zero if display has been |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4371 changed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4372 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4373 static int |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4374 update_window_line (w, vpos, mouse_face_overwritten_p) |
25012 | 4375 struct window *w; |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4376 int vpos, *mouse_face_overwritten_p; |
25012 | 4377 { |
4378 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); | |
4379 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4380 int changed_p = 0; |
25012 | 4381 |
4382 /* Set the row being updated. This is important to let xterm.c | |
4383 know what line height values are in effect. */ | |
4384 updated_row = desired_row; | |
4385 | |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4386 /* A row can be completely invisible in case a desired matrix was |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4387 built with a vscroll and then make_cursor_line_fully_visible shifts |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4388 the matrix. Make sure to make such rows current anyway, since |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4389 we need the correct y-position, for example, in the current matrix. */ |
31726
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4390 if (desired_row->mode_line_p |
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4391 || desired_row->visible_height > 0) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4392 { |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4393 xassert (desired_row->enabled_p); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4394 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4395 /* Update display of the left margin area, if there is one. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4396 if (!desired_row->full_width_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4397 && !NILP (w->left_margin_width)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4398 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4399 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4400 update_marginal_area (w, LEFT_MARGIN_AREA, vpos); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4401 } |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4402 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4403 /* Update the display of the text area. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4404 if (update_text_area (w, vpos)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4405 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4406 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4407 if (current_row->mouse_face_p) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4408 *mouse_face_overwritten_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4409 } |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4410 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4411 /* Update display of the right margin area, if there is one. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4412 if (!desired_row->full_width_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4413 && !NILP (w->right_margin_width)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4414 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4415 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4416 update_marginal_area (w, RIGHT_MARGIN_AREA, vpos); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4417 } |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4418 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4419 /* Draw truncation marks etc. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4420 if (!current_row->enabled_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4421 || desired_row->y != current_row->y |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4422 || desired_row->visible_height != current_row->visible_height |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4423 || desired_row->overlay_arrow_p != current_row->overlay_arrow_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4424 || desired_row->truncated_on_left_p != current_row->truncated_on_left_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4425 || desired_row->truncated_on_right_p != current_row->truncated_on_right_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4426 || desired_row->continued_p != current_row->continued_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4427 || desired_row->mode_line_p != current_row->mode_line_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4428 || (desired_row->indicate_empty_line_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4429 != current_row->indicate_empty_line_p) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4430 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4431 != MATRIX_ROW_CONTINUATION_LINE_P (current_row))) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4432 rif->after_update_window_line_hook (desired_row); |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4433 } |
25012 | 4434 |
4435 /* Update current_row from desired_row. */ | |
4436 make_current (w->desired_matrix, w->current_matrix, vpos); | |
4437 updated_row = NULL; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4438 return changed_p; |
25012 | 4439 } |
4440 | |
4441 | |
4442 /* Set the cursor after an update of window W. This function may only | |
4443 be called from update_window. */ | |
4444 | |
4445 static void | |
4446 set_window_cursor_after_update (w) | |
4447 struct window *w; | |
4448 { | |
4449 struct frame *f = XFRAME (w->frame); | |
4450 int cx, cy, vpos, hpos; | |
4451 | |
4452 /* Not intended for frame matrix updates. */ | |
4453 xassert (FRAME_WINDOW_P (f)); | |
4454 | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4455 if (cursor_in_echo_area |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4456 && !NILP (echo_area_buffer[0]) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4457 /* If we are showing a message instead of the mini-buffer, |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4458 show the cursor for the message instead. */ |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4459 && XWINDOW (minibuf_window) == w |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4460 && EQ (minibuf_window, echo_area_window) |
25012 | 4461 /* These cases apply only to the frame that contains |
4462 the active mini-buffer window. */ | |
4463 && FRAME_HAS_MINIBUF_P (f) | |
4464 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) | |
4465 { | |
4466 cx = cy = vpos = hpos = 0; | |
4467 | |
4468 if (cursor_in_echo_area >= 0) | |
4469 { | |
4470 /* If the mini-buffer is several lines high, find the last | |
4471 line that has any text on it. Note: either all lines | |
4472 are enabled or none. Otherwise we wouldn't be able to | |
4473 determine Y. */ | |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4474 struct glyph_row *row, *last_row; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4475 struct glyph *glyph; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4476 int yb = window_text_bottom_y (w); |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4477 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4478 last_row = NULL; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4479 for (row = MATRIX_ROW (w->current_matrix, 0); |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4480 row->enabled_p; |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4481 ++row) |
25012 | 4482 { |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4483 if (row->used[TEXT_AREA] |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4484 && row->glyphs[TEXT_AREA][0].charpos >= 0) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4485 last_row = row; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4486 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4487 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4488 break; |
25012 | 4489 } |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4490 |
25012 | 4491 if (last_row) |
4492 { | |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4493 struct glyph *start = row->glyphs[TEXT_AREA]; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4494 struct glyph *last = start + row->used[TEXT_AREA] - 1; |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4495 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4496 while (last > start && last->charpos < 0) |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4497 --last; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4498 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4499 for (glyph = start; glyph < last; ++glyph) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4500 { |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4501 cx += glyph->pixel_width; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4502 ++hpos; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4503 } |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4504 |
25012 | 4505 cy = last_row->y; |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4506 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix); |
25012 | 4507 } |
4508 } | |
4509 } | |
4510 else | |
4511 { | |
4512 cx = w->cursor.x; | |
4513 cy = w->cursor.y; | |
4514 hpos = w->cursor.hpos; | |
4515 vpos = w->cursor.vpos; | |
4516 } | |
4517 | |
4518 /* Window cursor can be out of sync for horizontally split windows. */ | |
4519 hpos = max (0, hpos); | |
4520 hpos = min (w->current_matrix->matrix_w - 1, hpos); | |
4521 vpos = max (0, vpos); | |
4522 vpos = min (w->current_matrix->nrows - 1, vpos); | |
4523 rif->cursor_to (vpos, hpos, cy, cx); | |
4524 } | |
4525 | |
4526 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4527 /* Set WINDOW->must_be_updated_p to ON_P for all windows in the window |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4528 tree rooted at W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4529 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4530 void |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4531 set_window_update_flags (w, on_p) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4532 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4533 int on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4534 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4535 while (w) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4536 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4537 if (!NILP (w->hchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4538 set_window_update_flags (XWINDOW (w->hchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4539 else if (!NILP (w->vchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4540 set_window_update_flags (XWINDOW (w->vchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4541 else |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4542 w->must_be_updated_p = on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4543 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4544 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4545 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4546 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4547 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4548 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4549 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4550 /*********************************************************************** |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4551 Window-Based Scrolling |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4552 ***********************************************************************/ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4553 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4554 /* Structure describing rows in scrolling_window. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4555 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4556 struct row_entry |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4557 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4558 /* Number of occurrences of this row in desired and current matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4559 int old_uses, new_uses; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4560 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4561 /* Vpos of row in new matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4562 int new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4563 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4564 /* Bucket index of this row_entry in the hash table row_table. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4565 int bucket; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4566 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4567 /* The row described by this entry. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4568 struct glyph_row *row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4569 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4570 /* Hash collision chain. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4571 struct row_entry *next; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4572 }; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4573 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4574 /* A pool to allocate row_entry structures from, and the size of the |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4575 pool. The pool is reallocated in scrolling_window when we find |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4576 that we need a larger one. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4577 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4578 static struct row_entry *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4579 static int row_entry_pool_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4580 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4581 /* Index of next free entry in row_entry_pool. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4582 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4583 static int row_entry_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4584 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4585 /* The hash table used during scrolling, and the table's size. This |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4586 table is used to quickly identify equal rows in the desired and |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4587 current matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4588 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4589 static struct row_entry **row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4590 static int row_table_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4591 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4592 /* Vectors of pointers to row_entry structures belonging to the |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4593 current and desired matrix, and the size of the vectors. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4594 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4595 static struct row_entry **old_lines, **new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4596 static int old_lines_size, new_lines_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4597 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4598 /* A pool to allocate run structures from, and its size. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4599 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4600 static struct run *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4601 static int runs_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4602 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4603 /* A vector of runs of lines found during scrolling. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4604 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4605 static struct run **runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4606 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4607 static struct row_entry *add_row_entry P_ ((struct window *, |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4608 struct glyph_row *)); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4609 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4610 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4611 /* Add glyph row ROW to the scrolling hash table during the scrolling |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4612 of window W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4613 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4614 static INLINE struct row_entry * |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4615 add_row_entry (w, row) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4616 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4617 struct glyph_row *row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4618 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4619 struct row_entry *entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4620 int i = row->hash % row_table_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4621 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4622 entry = row_table[i]; |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
4623 while (entry && !row_equal_p (w, entry->row, row, 1)) |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4624 entry = entry->next; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4625 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4626 if (entry == NULL) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4627 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4628 entry = row_entry_pool + row_entry_idx++; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4629 entry->row = row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4630 entry->old_uses = entry->new_uses = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4631 entry->new_line_number = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4632 entry->bucket = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4633 entry->next = row_table[i]; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4634 row_table[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4635 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4636 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4637 return entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4638 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4639 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4640 |
25012 | 4641 /* Try to reuse part of the current display of W by scrolling lines. |
25546 | 4642 HEADER_LINE_P non-zero means W has a top mode line. |
25012 | 4643 |
4644 The algorithm is taken from Communications of the ACM, Apr78 "A | |
4645 Technique for Isolating Differences Between Files." It should take | |
4646 O(N) time. | |
4647 | |
4648 A short outline of the steps of the algorithm | |
4649 | |
4650 1. Skip lines equal at the start and end of both matrices. | |
4651 | |
4652 2. Enter rows in the current and desired matrix into a symbol | |
4653 table, counting how often they appear in both matrices. | |
4654 | |
4655 3. Rows that appear exactly once in both matrices serve as anchors, | |
4656 i.e. we assume that such lines are likely to have been moved. | |
4657 | |
4658 4. Starting from anchor lines, extend regions to be scrolled both | |
4659 forward and backward. | |
4660 | |
4661 Value is | |
4662 | |
4663 -1 if all rows were found to be equal. | |
4664 0 to indicate that we did not scroll the display, or | |
4665 1 if we did scroll. */ | |
4666 | |
4667 static int | |
25546 | 4668 scrolling_window (w, header_line_p) |
25012 | 4669 struct window *w; |
25546 | 4670 int header_line_p; |
25012 | 4671 { |
4672 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4673 struct glyph_matrix *current_matrix = w->current_matrix; | |
4674 int yb = window_text_bottom_y (w); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4675 int i, j, first_old, first_new, last_old, last_new; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4676 int nruns, nbytes, n, run_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4677 struct row_entry *entry; |
25012 | 4678 |
4679 /* Skip over rows equal at the start. */ | |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4680 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i) |
25012 | 4681 { |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4682 struct glyph_row *d = MATRIX_ROW (desired_matrix, i); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4683 struct glyph_row *c = MATRIX_ROW (current_matrix, i); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4684 |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4685 if (c->enabled_p |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4686 && d->enabled_p |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4687 && c->y == d->y |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4688 && MATRIX_ROW_BOTTOM_Y (c) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4689 && MATRIX_ROW_BOTTOM_Y (d) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4690 && row_equal_p (w, c, d, 1)) |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4691 { |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4692 assign_row (c, d); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4693 d->enabled_p = 0; |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4694 } |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4695 else |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4696 break; |
25012 | 4697 } |
4698 | |
4699 /* Give up if some rows in the desired matrix are not enabled. */ | |
4700 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4701 return -1; | |
4702 | |
4703 first_old = first_new = i; | |
4704 | |
4705 /* Set last_new to the index + 1 of the last enabled row in the | |
4706 desired matrix. */ | |
4707 i = first_new + 1; | |
4708 while (i < desired_matrix->nrows - 1 | |
4709 && MATRIX_ROW (desired_matrix, i)->enabled_p | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4710 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb) |
25012 | 4711 ++i; |
4712 | |
4713 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4714 return 0; | |
4715 | |
4716 last_new = i; | |
4717 | |
4718 /* Set last_old to the index + 1 of the last enabled row in the | |
4719 current matrix. We don't look at the enabled flag here because | |
4720 we plan to reuse part of the display even if other parts are | |
4721 disabled. */ | |
4722 i = first_old + 1; | |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4723 while (i < current_matrix->nrows - 1) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4724 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4725 int bottom = MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (current_matrix, i)); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4726 if (bottom <= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4727 ++i; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4728 if (bottom >= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4729 break; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4730 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4731 |
25012 | 4732 last_old = i; |
4733 | |
4734 /* Skip over rows equal at the bottom. */ | |
4735 i = last_new; | |
4736 j = last_old; | |
4737 while (i - 1 > first_new | |
4738 && j - 1 > first_old | |
4739 && MATRIX_ROW (current_matrix, i - 1)->enabled_p | |
4740 && (MATRIX_ROW (current_matrix, i - 1)->y | |
4741 == MATRIX_ROW (desired_matrix, j - 1)->y) | |
4742 && row_equal_p (w, | |
4743 MATRIX_ROW (desired_matrix, i - 1), | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
4744 MATRIX_ROW (current_matrix, j - 1), 1)) |
25012 | 4745 --i, --j; |
4746 last_new = i; | |
4747 last_old = j; | |
4748 | |
4749 /* Nothing to do if all rows are equal. */ | |
4750 if (last_new == first_new) | |
4751 return 0; | |
4752 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4753 /* Reallocate vectors, tables etc. if necessary. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4754 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4755 if (current_matrix->nrows > old_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4756 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4757 old_lines_size = current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4758 nbytes = old_lines_size * sizeof *old_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4759 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4760 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4761 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4762 if (desired_matrix->nrows > new_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4763 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4764 new_lines_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4765 nbytes = new_lines_size * sizeof *new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4766 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4767 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4768 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4769 n = desired_matrix->nrows + current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4770 if (3 * n > row_table_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4771 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4772 row_table_size = next_almost_prime (3 * n); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4773 nbytes = row_table_size * sizeof *row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4774 row_table = (struct row_entry **) xrealloc (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4775 bzero (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4776 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4777 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4778 if (n > row_entry_pool_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4779 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4780 row_entry_pool_size = n; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4781 nbytes = row_entry_pool_size * sizeof *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4782 row_entry_pool = (struct row_entry *) xrealloc (row_entry_pool, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4783 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4784 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4785 if (desired_matrix->nrows > runs_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4786 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4787 runs_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4788 nbytes = runs_size * sizeof *runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4789 runs = (struct run **) xrealloc (runs, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4790 nbytes = runs_size * sizeof *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4791 run_pool = (struct run *) xrealloc (run_pool, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4792 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4793 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4794 nruns = run_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4795 row_entry_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4796 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4797 /* Add rows from the current and desired matrix to the hash table |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4798 row_hash_table to be able to find equal ones quickly. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4799 |
25012 | 4800 for (i = first_old; i < last_old; ++i) |
4801 { | |
4802 if (MATRIX_ROW (current_matrix, i)->enabled_p) | |
4803 { | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4804 entry = add_row_entry (w, MATRIX_ROW (current_matrix, i)); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4805 old_lines[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4806 ++entry->old_uses; |
25012 | 4807 } |
4808 else | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4809 old_lines[i] = NULL; |
25012 | 4810 } |
4811 | |
4812 for (i = first_new; i < last_new; ++i) | |
4813 { | |
4814 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i)); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4815 entry = add_row_entry (w, MATRIX_ROW (desired_matrix, i)); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4816 ++entry->new_uses; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4817 entry->new_line_number = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4818 new_lines[i] = entry; |
25012 | 4819 } |
4820 | |
4821 /* Identify moves based on lines that are unique and equal | |
4822 in both matrices. */ | |
4823 for (i = first_old; i < last_old;) | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4824 if (old_lines[i] |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4825 && old_lines[i]->old_uses == 1 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4826 && old_lines[i]->new_uses == 1) |
25012 | 4827 { |
4828 int j, k; | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4829 int new_line = old_lines[i]->new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4830 struct run *run = run_pool + run_idx++; |
25012 | 4831 |
4832 /* Record move. */ | |
4833 run->current_vpos = i; | |
4834 run->current_y = MATRIX_ROW (current_matrix, i)->y; | |
4835 run->desired_vpos = new_line; | |
4836 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y; | |
4837 run->nrows = 1; | |
4838 run->height = MATRIX_ROW (current_matrix, i)->height; | |
4839 | |
4840 /* Extend backward. */ | |
4841 j = i - 1; | |
4842 k = new_line - 1; | |
4843 while (j > first_old | |
4844 && k > first_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4845 && old_lines[j] == new_lines[k]) |
25012 | 4846 { |
4847 int h = MATRIX_ROW (current_matrix, j)->height; | |
4848 --run->current_vpos; | |
4849 --run->desired_vpos; | |
4850 ++run->nrows; | |
4851 run->height += h; | |
4852 run->desired_y -= h; | |
4853 run->current_y -= h; | |
4854 --j, --k; | |
4855 } | |
4856 | |
4857 /* Extend forward. */ | |
4858 j = i + 1; | |
4859 k = new_line + 1; | |
4860 while (j < last_old | |
4861 && k < last_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4862 && old_lines[j] == new_lines[k]) |
25012 | 4863 { |
4864 int h = MATRIX_ROW (current_matrix, j)->height; | |
4865 ++run->nrows; | |
4866 run->height += h; | |
4867 ++j, ++k; | |
4868 } | |
4869 | |
4870 /* Insert run into list of all runs. Order runs by copied | |
4871 pixel lines. Note that we record runs that don't have to | |
4872 be copied because they are already in place. This is done | |
4873 because we can avoid calling update_window_line in this | |
4874 case. */ | |
4875 for (j = 0; j < nruns && runs[j]->height > run->height; ++j) | |
4876 ; | |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
4877 for (k = nruns; k > j; --k) |
25012 | 4878 runs[k] = runs[k - 1]; |
4879 runs[j] = run; | |
4880 ++nruns; | |
4881 | |
4882 i += run->nrows; | |
4883 } | |
4884 else | |
4885 ++i; | |
4886 | |
4887 /* Do the moves. Do it in a way that we don't overwrite something | |
4888 we want to copy later on. This is not solvable in general | |
4889 because there is only one display and we don't have a way to | |
4890 exchange areas on this display. Example: | |
4891 | |
4892 +-----------+ +-----------+ | |
4893 | A | | B | | |
4894 +-----------+ --> +-----------+ | |
4895 | B | | A | | |
4896 +-----------+ +-----------+ | |
4897 | |
4898 Instead, prefer bigger moves, and invalidate moves that would | |
4899 copy from where we copied to. */ | |
4900 | |
4901 for (i = 0; i < nruns; ++i) | |
4902 if (runs[i]->nrows > 0) | |
4903 { | |
4904 struct run *r = runs[i]; | |
4905 | |
4906 /* Copy on the display. */ | |
4907 if (r->current_y != r->desired_y) | |
4908 { | |
4909 rif->scroll_run_hook (w, r); | |
4910 | |
4911 /* Invalidate runs that copy from where we copied to. */ | |
4912 for (j = i + 1; j < nruns; ++j) | |
4913 { | |
4914 struct run *p = runs[j]; | |
4915 | |
4916 if ((p->current_y >= r->desired_y | |
4917 && p->current_y < r->desired_y + r->height) | |
4918 || (p->current_y + p->height >= r->desired_y | |
4919 && (p->current_y + p->height | |
4920 < r->desired_y + r->height))) | |
4921 p->nrows = 0; | |
4922 } | |
4923 } | |
4924 | |
4925 /* Assign matrix rows. */ | |
4926 for (j = 0; j < r->nrows; ++j) | |
4927 { | |
4928 struct glyph_row *from, *to; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4929 int to_overlapped_p; |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4930 |
25012 | 4931 to = MATRIX_ROW (current_matrix, r->desired_vpos + j); |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4932 from = MATRIX_ROW (desired_matrix, r->desired_vpos + j); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4933 to_overlapped_p = to->overlapped_p; |
25012 | 4934 assign_row (to, from); |
4935 to->enabled_p = 1, from->enabled_p = 0; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4936 to->overlapped_p = to_overlapped_p; |
25012 | 4937 } |
4938 } | |
4939 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4940 /* Clear the hash table, for the next time. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4941 for (i = 0; i < row_entry_idx; ++i) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4942 row_table[row_entry_pool[i].bucket] = NULL; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4943 |
25012 | 4944 /* Value is non-zero to indicate that we scrolled the display. */ |
4945 return 1; | |
4946 } | |
4947 | |
4948 | |
4949 | |
4950 /************************************************************************ | |
4951 Frame-Based Updates | |
4952 ************************************************************************/ | |
4953 | |
4954 /* Update the desired frame matrix of frame F. | |
4955 | |
4956 FORCE_P non-zero means that the update should not be stopped by | |
4957 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling | |
4958 should not be tried. | |
4959 | |
4960 Value is non-zero if update was stopped due to pending input. */ | |
4961 | |
4962 static int | |
4963 update_frame_1 (f, force_p, inhibit_id_p) | |
4964 struct frame *f; | |
4965 int force_p; | |
4966 int inhibit_id_p; | |
4967 { | |
4968 /* Frame matrices to work on. */ | |
4969 struct glyph_matrix *current_matrix = f->current_matrix; | |
4970 struct glyph_matrix *desired_matrix = f->desired_matrix; | |
4971 int i; | |
314 | 4972 int pause; |
4973 int preempt_count = baud_rate / 2400 + 1; | |
21514 | 4974 extern int input_pending; |
25012 | 4975 |
4976 xassert (current_matrix && desired_matrix); | |
314 | 4977 |
10122
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
4978 if (baud_rate != FRAME_COST_BAUD_RATE (f)) |
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
4979 calculate_costs (f); |
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
4980 |
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
4981 if (preempt_count <= 0) |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
4982 preempt_count = 1; |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
4983 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
4984 if (redisplay_dont_pause) |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
4985 force_p = 1; |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
4986 else if (!force_p && detect_input_pending ()) |
314 | 4987 { |
4988 pause = 1; | |
4989 goto do_pause; | |
4990 } | |
4991 | |
25012 | 4992 /* If we cannot insert/delete lines, it's no use trying it. */ |
314 | 4993 if (!line_ins_del_ok) |
25012 | 4994 inhibit_id_p = 1; |
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
4995 |
493 | 4996 /* See if any of the desired lines are enabled; don't compute for |
25012 | 4997 i/d line if just want cursor motion. */ |
4998 for (i = 0; i < desired_matrix->nrows; i++) | |
4999 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
314 | 5000 break; |
5001 | |
5002 /* Try doing i/d line, if not yet inhibited. */ | |
25012 | 5003 if (!inhibit_id_p && i < desired_matrix->nrows) |
5004 force_p |= scrolling (f); | |
314 | 5005 |
5006 /* Update the individual lines as needed. Do bottom line first. */ | |
25012 | 5007 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1)) |
5008 update_frame_line (f, desired_matrix->nrows - 1); | |
5009 | |
5010 /* Now update the rest of the lines. */ | |
5011 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++) | |
314 | 5012 { |
25012 | 5013 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) |
314 | 5014 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5015 if (FRAME_TERMCAP_P (f)) |
314 | 5016 { |
5017 /* Flush out every so many lines. | |
5018 Also flush out if likely to have more than 1k buffered | |
5019 otherwise. I'm told that some telnet connections get | |
5020 really screwed by more than 1k output at once. */ | |
5021 int outq = PENDING_OUTPUT_COUNT (stdout); | |
5022 if (outq > 900 | |
5023 || (outq > 20 && ((i - 1) % preempt_count == 0))) | |
5024 { | |
5025 fflush (stdout); | |
5026 if (preempt_count == 1) | |
5027 { | |
554 | 5028 #ifdef EMACS_OUTQSIZE |
5029 if (EMACS_OUTQSIZE (0, &outq) < 0) | |
314 | 5030 /* Probably not a tty. Ignore the error and reset |
25012 | 5031 * the outq count. */ |
314 | 5032 outq = PENDING_OUTPUT_COUNT (stdout); |
5033 #endif | |
5034 outq *= 10; | |
7530
57c2345a9002
(update_frame): Fix test of outq and baud_rate some more.
Richard M. Stallman <rms@gnu.org>
parents:
7529
diff
changeset
|
5035 if (baud_rate <= outq && baud_rate > 0) |
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5036 sleep (outq / baud_rate); |
314 | 5037 } |
5038 } | |
5039 } | |
5040 | |
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5041 if ((i - 1) % preempt_count == 0) |
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5042 detect_input_pending (); |
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5043 |
25012 | 5044 update_frame_line (f, i); |
314 | 5045 } |
5046 } | |
25012 | 5047 |
764 | 5048 pause = (i < FRAME_HEIGHT (f) - 1) ? i : 0; |
314 | 5049 |
5050 /* Now just clean up termcap drivers and set cursor, etc. */ | |
5051 if (!pause) | |
5052 { | |
12409
6e374b28ecc3
(update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents:
12193
diff
changeset
|
5053 if ((cursor_in_echo_area |
25012 | 5054 /* If we are showing a message instead of the mini-buffer, |
12627
c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents:
12532
diff
changeset
|
5055 show the cursor for the message instead of for the |
25012 | 5056 (now hidden) mini-buffer contents. */ |
12627
c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents:
12532
diff
changeset
|
5057 || (EQ (minibuf_window, selected_window) |
c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents:
12532
diff
changeset
|
5058 && EQ (minibuf_window, echo_area_window) |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5059 && !NILP (echo_area_buffer[0]))) |
12627
c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents:
12532
diff
changeset
|
5060 /* These cases apply only to the frame that contains |
25012 | 5061 the active mini-buffer window. */ |
12627
c7bc7a24b1ff
(update_frame): Check that the echo area is in the frame being displayed.
Richard M. Stallman <rms@gnu.org>
parents:
12532
diff
changeset
|
5062 && FRAME_HAS_MINIBUF_P (f) |
14459
c1d25453a95f
(update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents:
14286
diff
changeset
|
5063 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) |
708 | 5064 { |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5065 int top = XINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5066 int row, col; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5067 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5068 if (cursor_in_echo_area < 0) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5069 { |
25012 | 5070 /* Negative value of cursor_in_echo_area means put |
5071 cursor at beginning of line. */ | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5072 row = top; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5073 col = 0; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5074 } |
708 | 5075 else |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5076 { |
25012 | 5077 /* Positive value of cursor_in_echo_area means put |
5078 cursor at the end of the prompt. If the mini-buffer | |
5079 is several lines high, find the last line that has | |
5080 any text on it. */ | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5081 row = FRAME_HEIGHT (f); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5082 do |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5083 { |
25012 | 5084 --row; |
5085 col = 0; | |
5086 | |
5087 if (MATRIX_ROW_ENABLED_P (current_matrix, row)) | |
5088 { | |
5089 /* Frame rows are filled up with spaces that | |
5090 must be ignored here. */ | |
5091 struct glyph_row *r = MATRIX_ROW (current_matrix, | |
5092 row); | |
5093 struct glyph *start = r->glyphs[TEXT_AREA]; | |
5094 struct glyph *last = start + r->used[TEXT_AREA]; | |
5095 | |
5096 while (last > start | |
5097 && (last - 1)->charpos < 0) | |
5098 --last; | |
5099 | |
5100 col = last - start; | |
5101 } | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5102 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5103 while (row > top && col == 0); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5104 |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5105 /* Make sure COL is not out of range. */ |
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
5106 if (col >= FRAME_CURSOR_X_LIMIT (f)) |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5107 { |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5108 /* If we have another row, advance cursor into it. */ |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5109 if (row < FRAME_HEIGHT (f) - 1) |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5110 { |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5111 col = FRAME_LEFT_SCROLL_BAR_WIDTH (f); |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5112 row++; |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5113 } |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5114 /* Otherwise move it back in range. */ |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5115 else |
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
5116 col = FRAME_CURSOR_X_LIMIT (f) - 1; |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5117 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5118 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5119 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5120 cursor_to (row, col); |
708 | 5121 } |
314 | 5122 else |
25012 | 5123 { |
5124 /* We have only one cursor on terminal frames. Use it to | |
5125 display the cursor of the selected window. */ | |
5126 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
29687
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5127 if (w->cursor.vpos >= 0 |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5128 /* The cursor vpos may be temporarily out of bounds |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5129 in the following situation: There is one window, |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5130 with the cursor in the lower half of it. The window |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5131 is split, and a message causes a redisplay before |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5132 a new cursor position has been computed. */ |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5133 && w->cursor.vpos < XFASTINT (w->height)) |
25012 | 5134 { |
5135 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); | |
5136 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
5137 | |
5138 if (INTEGERP (w->left_margin_width)) | |
5139 x += XFASTINT (w->left_margin_width); | |
5140 | |
5141 /* x = max (min (x, FRAME_WINDOW_WIDTH (f) - 1), 0); */ | |
5142 cursor_to (y, x); | |
5143 } | |
5144 } | |
314 | 5145 } |
5146 | |
5147 do_pause: | |
5148 | |
25012 | 5149 clear_desired_matrices (f); |
314 | 5150 return pause; |
5151 } | |
5152 | |
25012 | 5153 |
5154 /* Do line insertions/deletions on frame F for frame-based redisplay. */ | |
314 | 5155 |
21514 | 5156 int |
764 | 5157 scrolling (frame) |
25012 | 5158 struct frame *frame; |
314 | 5159 { |
5160 int unchanged_at_top, unchanged_at_bottom; | |
5161 int window_size; | |
5162 int changed_lines; | |
764 | 5163 int *old_hash = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); |
5164 int *new_hash = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); | |
5165 int *draw_cost = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); | |
10259
48e4dfc6bb43
(scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents:
10122
diff
changeset
|
5166 int *old_draw_cost = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); |
314 | 5167 register int i; |
764 | 5168 int free_at_end_vpos = FRAME_HEIGHT (frame); |
25012 | 5169 struct glyph_matrix *current_matrix = frame->current_matrix; |
5170 struct glyph_matrix *desired_matrix = frame->desired_matrix; | |
5171 | |
5172 if (!current_matrix) | |
5173 abort (); | |
5174 | |
5175 /* Compute hash codes of all the lines. Also calculate number of | |
5176 changed lines, number of unchanged lines at the beginning, and | |
5177 number of unchanged lines at the end. */ | |
314 | 5178 changed_lines = 0; |
5179 unchanged_at_top = 0; | |
764 | 5180 unchanged_at_bottom = FRAME_HEIGHT (frame); |
5181 for (i = 0; i < FRAME_HEIGHT (frame); i++) | |
314 | 5182 { |
5183 /* Give up on this scrolling if some old lines are not enabled. */ | |
25012 | 5184 if (!MATRIX_ROW_ENABLED_P (current_matrix, i)) |
314 | 5185 return 0; |
25012 | 5186 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i)); |
5187 if (! MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5188 { |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5189 /* This line cannot be redrawn, so don't let scrolling mess it. */ |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5190 new_hash[i] = old_hash[i]; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5191 #define INFINITY 1000000 /* Taken from scroll.c */ |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5192 draw_cost[i] = INFINITY; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5193 } |
314 | 5194 else |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5195 { |
25012 | 5196 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i)); |
5197 draw_cost[i] = line_draw_cost (desired_matrix, i); | |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5198 } |
314 | 5199 |
5200 if (old_hash[i] != new_hash[i]) | |
5201 { | |
5202 changed_lines++; | |
764 | 5203 unchanged_at_bottom = FRAME_HEIGHT (frame) - i - 1; |
314 | 5204 } |
5205 else if (i == unchanged_at_top) | |
5206 unchanged_at_top++; | |
25012 | 5207 old_draw_cost[i] = line_draw_cost (current_matrix, i); |
314 | 5208 } |
5209 | |
5210 /* If changed lines are few, don't allow preemption, don't scroll. */ | |
25012 | 5211 if ((!scroll_region_ok && changed_lines < baud_rate / 2400) |
764 | 5212 || unchanged_at_bottom == FRAME_HEIGHT (frame)) |
314 | 5213 return 1; |
5214 | |
764 | 5215 window_size = (FRAME_HEIGHT (frame) - unchanged_at_top |
314 | 5216 - unchanged_at_bottom); |
5217 | |
5218 if (scroll_region_ok) | |
5219 free_at_end_vpos -= unchanged_at_bottom; | |
764 | 5220 else if (memory_below_frame) |
314 | 5221 free_at_end_vpos = -1; |
5222 | |
5223 /* If large window, fast terminal and few lines in common between | |
25012 | 5224 current frame and desired frame, don't bother with i/d calc. */ |
10259
48e4dfc6bb43
(scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents:
10122
diff
changeset
|
5225 if (!scroll_region_ok && window_size >= 18 && baud_rate > 2400 |
314 | 5226 && (window_size >= |
5227 10 * scrolling_max_lines_saved (unchanged_at_top, | |
764 | 5228 FRAME_HEIGHT (frame) - unchanged_at_bottom, |
314 | 5229 old_hash, new_hash, draw_cost))) |
5230 return 0; | |
5231 | |
25012 | 5232 if (window_size < 2) |
5233 return 0; | |
5234 | |
764 | 5235 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, |
314 | 5236 draw_cost + unchanged_at_top - 1, |
10259
48e4dfc6bb43
(scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents:
10122
diff
changeset
|
5237 old_draw_cost + unchanged_at_top - 1, |
314 | 5238 old_hash + unchanged_at_top - 1, |
5239 new_hash + unchanged_at_top - 1, | |
5240 free_at_end_vpos - unchanged_at_top); | |
5241 | |
5242 return 0; | |
5243 } | |
25012 | 5244 |
5245 | |
5246 /* Count the number of blanks at the start of the vector of glyphs R | |
5247 which is LEN glyphs long. */ | |
5248 | |
5249 static int | |
5250 count_blanks (r, len) | |
5251 struct glyph *r; | |
5252 int len; | |
314 | 5253 { |
25012 | 5254 int i; |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5255 |
25012 | 5256 for (i = 0; i < len; ++i) |
5257 if (!CHAR_GLYPH_SPACE_P (r[i])) | |
5258 break; | |
5259 | |
5260 return i; | |
314 | 5261 } |
25012 | 5262 |
5263 | |
5264 /* Count the number of glyphs in common at the start of the glyph | |
5265 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end | |
5266 of STR2. Value is the number of equal glyphs equal at the start. */ | |
314 | 5267 |
5268 static int | |
25012 | 5269 count_match (str1, end1, str2, end2) |
5270 struct glyph *str1, *end1, *str2, *end2; | |
314 | 5271 { |
25012 | 5272 struct glyph *p1 = str1; |
5273 struct glyph *p2 = str2; | |
5274 | |
5275 while (p1 < end1 | |
5276 && p2 < end2 | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
5277 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2)) |
25012 | 5278 ++p1, ++p2; |
5279 | |
5280 return p1 - str1; | |
314 | 5281 } |
5282 | |
25012 | 5283 |
314 | 5284 /* Char insertion/deletion cost vector, from term.c */ |
25012 | 5285 |
314 | 5286 extern int *char_ins_del_vector; |
16267
05ca2cb9fe0f
(make_frame_glyphs, update_line, update_frame)
Richard M. Stallman <rms@gnu.org>
parents:
16256
diff
changeset
|
5287 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_WINDOW_WIDTH((f))]) |
314 | 5288 |
25012 | 5289 |
5290 /* Perform a frame-based update on line VPOS in frame FRAME. */ | |
5291 | |
314 | 5292 static void |
25012 | 5293 update_frame_line (frame, vpos) |
5294 register struct frame *frame; | |
314 | 5295 int vpos; |
5296 { | |
25012 | 5297 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend; |
314 | 5298 int tem; |
5299 int osp, nsp, begmatch, endmatch, olen, nlen; | |
25012 | 5300 struct glyph_matrix *current_matrix = frame->current_matrix; |
5301 struct glyph_matrix *desired_matrix = frame->desired_matrix; | |
5302 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos); | |
5303 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos); | |
5304 int must_write_whole_line_p; | |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5305 int write_spaces_p = must_write_spaces; |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5306 int colored_spaces_p = (FACE_FROM_ID (frame, DEFAULT_FACE_ID)->background |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5307 != FACE_TTY_DEFAULT_BG_COLOR); |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5308 |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5309 if (colored_spaces_p) |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5310 write_spaces_p = 1; |
25012 | 5311 |
5312 if (desired_row->inverse_p | |
5313 != (current_row->enabled_p && current_row->inverse_p)) | |
314 | 5314 { |
25012 | 5315 int n = current_row->enabled_p ? current_row->used[TEXT_AREA] : 0; |
5316 change_line_highlight (desired_row->inverse_p, vpos, vpos, n); | |
5317 current_row->enabled_p = 0; | |
314 | 5318 } |
5319 else | |
25012 | 5320 reassert_line_highlight (desired_row->inverse_p, vpos); |
5321 | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5322 /* Current row not enabled means it has unknown contents. We must |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5323 write the whole desired line in that case. */ |
25012 | 5324 must_write_whole_line_p = !current_row->enabled_p; |
5325 if (must_write_whole_line_p) | |
314 | 5326 { |
25012 | 5327 obody = 0; |
314 | 5328 olen = 0; |
5329 } | |
5330 else | |
5331 { | |
25012 | 5332 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos); |
5333 olen = current_row->used[TEXT_AREA]; | |
5334 | |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5335 if (!current_row->inverse_p) |
314 | 5336 { |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5337 /* Ignore trailing spaces, if we can. */ |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5338 if (!write_spaces_p) |
25012 | 5339 while (olen > 0 && CHAR_GLYPH_SPACE_P (obody[olen-1])) |
314 | 5340 olen--; |
5341 } | |
5342 else | |
5343 { | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5344 /* For an inverse-video line, make sure it's filled with |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5345 spaces all the way to the frame edge so that the reverse |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5346 video extends all the way across. */ |
25012 | 5347 while (olen < FRAME_WIDTH (frame) - 1) |
5348 obody[olen++] = space_glyph; | |
314 | 5349 } |
5350 } | |
5351 | |
25012 | 5352 current_row->enabled_p = 1; |
5353 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA]; | |
5354 current_row->inverse_p = desired_row->inverse_p; | |
5355 | |
5356 /* If desired line is empty, just clear the line. */ | |
5357 if (!desired_row->enabled_p) | |
314 | 5358 { |
5359 nlen = 0; | |
5360 goto just_erase; | |
5361 } | |
5362 | |
25012 | 5363 nbody = desired_row->glyphs[TEXT_AREA]; |
5364 nlen = desired_row->used[TEXT_AREA]; | |
5365 nend = nbody + nlen; | |
5366 | |
5367 /* If display line has unknown contents, write the whole line. */ | |
5368 if (must_write_whole_line_p) | |
5369 { | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5370 /* Ignore spaces at the end, if we can. */ |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5371 if (!write_spaces_p) |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5372 while (nlen > 0 && CHAR_GLYPH_SPACE_P (nbody[nlen - 1])) |
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5373 --nlen; |
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5374 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5375 /* Write the contents of the desired line. */ |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5376 if (nlen) |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5377 { |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5378 cursor_to (vpos, 0); |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5379 write_glyphs (nbody, nlen); |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5380 } |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5381 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5382 /* Don't call clear_end_of_line if we already wrote the whole |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5383 line. The cursor will not be at the right margin in that |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5384 case but in the line below. */ |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5385 if (nlen < FRAME_WINDOW_WIDTH (frame)) |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5386 { |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5387 cursor_to (vpos, nlen); |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5388 clear_end_of_line (FRAME_WINDOW_WIDTH (frame)); |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5389 } |
28682
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5390 else |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5391 /* Make sure we are in the right row, otherwise cursor movement |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5392 with cmgoto might use `ch' in the wrong row. */ |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5393 cursor_to (vpos, 0); |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5394 |
25012 | 5395 make_current (desired_matrix, current_matrix, vpos); |
5396 return; | |
5397 } | |
314 | 5398 |
5399 /* Pretend trailing spaces are not there at all, | |
5400 unless for one reason or another we must write all spaces. */ | |
25012 | 5401 if (!desired_row->inverse_p) |
314 | 5402 { |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5403 if (!write_spaces_p) |
25012 | 5404 while (nlen > 0 && CHAR_GLYPH_SPACE_P (nbody[nlen - 1])) |
314 | 5405 nlen--; |
5406 } | |
5407 else | |
5408 { | |
25012 | 5409 /* For an inverse-video line, give it extra trailing spaces all |
5410 the way to the frame edge so that the reverse video extends | |
5411 all the way across. */ | |
5412 while (nlen < FRAME_WIDTH (frame) - 1) | |
5413 nbody[nlen++] = space_glyph; | |
314 | 5414 } |
5415 | |
5416 /* If there's no i/d char, quickly do the best we can without it. */ | |
5417 if (!char_ins_del_ok) | |
5418 { | |
25012 | 5419 int i, j; |
5420 | |
5421 /* Find the first glyph in desired row that doesn't agree with | |
5422 a glyph in the current row, and write the rest from there on. */ | |
314 | 5423 for (i = 0; i < nlen; i++) |
5424 { | |
25012 | 5425 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i)) |
314 | 5426 { |
25012 | 5427 /* Find the end of the run of different glyphs. */ |
5428 j = i + 1; | |
5429 while (j < nlen | |
5430 && (j >= olen | |
5431 || !GLYPH_EQUAL_P (nbody + j, obody + j) | |
5432 || CHAR_GLYPH_PADDING_P (nbody[j]))) | |
5433 ++j; | |
5434 | |
5435 /* Output this run of non-matching chars. */ | |
314 | 5436 cursor_to (vpos, i); |
25012 | 5437 write_glyphs (nbody + i, j - i); |
5438 i = j - 1; | |
314 | 5439 |
5440 /* Now find the next non-match. */ | |
5441 } | |
5442 } | |
5443 | |
5444 /* Clear the rest of the line, or the non-clear part of it. */ | |
5445 if (olen > nlen) | |
5446 { | |
5447 cursor_to (vpos, nlen); | |
5448 clear_end_of_line (olen); | |
5449 } | |
5450 | |
25012 | 5451 /* Make current row = desired row. */ |
5452 make_current (desired_matrix, current_matrix, vpos); | |
314 | 5453 return; |
5454 } | |
5455 | |
25012 | 5456 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete |
5457 characters in a row. */ | |
5458 | |
314 | 5459 if (!olen) |
5460 { | |
25012 | 5461 /* If current line is blank, skip over initial spaces, if |
5462 possible, and write the rest. */ | |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5463 if (write_spaces_p || desired_row->inverse_p) |
25012 | 5464 nsp = 0; |
5465 else | |
5466 nsp = count_blanks (nbody, nlen); | |
5467 | |
314 | 5468 if (nlen > nsp) |
5469 { | |
5470 cursor_to (vpos, nsp); | |
5471 write_glyphs (nbody + nsp, nlen - nsp); | |
5472 } | |
5473 | |
764 | 5474 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5475 make_current (desired_matrix, current_matrix, vpos); |
314 | 5476 return; |
5477 } | |
5478 | |
5479 /* Compute number of leading blanks in old and new contents. */ | |
25012 | 5480 osp = count_blanks (obody, olen); |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5481 nsp = (desired_row->inverse_p || colored_spaces_p |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5482 ? 0 |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5483 : count_blanks (nbody, nlen)); |
25012 | 5484 |
5485 /* Compute number of matching chars starting with first non-blank. */ | |
5486 begmatch = count_match (obody + osp, obody + olen, | |
5487 nbody + nsp, nbody + nlen); | |
314 | 5488 |
5489 /* Spaces in new match implicit space past the end of old. */ | |
5490 /* A bug causing this to be a no-op was fixed in 18.29. */ | |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5491 if (!write_spaces_p && osp + begmatch == olen) |
314 | 5492 { |
5493 np1 = nbody + nsp; | |
25012 | 5494 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch])) |
5495 ++begmatch; | |
314 | 5496 } |
5497 | |
5498 /* Avoid doing insert/delete char | |
5499 just cause number of leading spaces differs | |
25012 | 5500 when the following text does not match. */ |
314 | 5501 if (begmatch == 0 && osp != nsp) |
5502 osp = nsp = min (osp, nsp); | |
5503 | |
5504 /* Find matching characters at end of line */ | |
5505 op1 = obody + olen; | |
5506 np1 = nbody + nlen; | |
5507 op2 = op1 + begmatch - min (olen - osp, nlen - nsp); | |
25012 | 5508 while (op1 > op2 |
5509 && GLYPH_EQUAL_P (op1 - 1, np1 - 1)) | |
314 | 5510 { |
5511 op1--; | |
5512 np1--; | |
5513 } | |
5514 endmatch = obody + olen - op1; | |
5515 | |
5516 /* tem gets the distance to insert or delete. | |
5517 endmatch is how many characters we save by doing so. | |
5518 Is it worth it? */ | |
5519 | |
5520 tem = (nlen - nsp) - (olen - osp); | |
5521 if (endmatch && tem | |
764 | 5522 && (!char_ins_del_ok || endmatch <= char_ins_del_cost (frame)[tem])) |
314 | 5523 endmatch = 0; |
5524 | |
5525 /* nsp - osp is the distance to insert or delete. | |
5526 If that is nonzero, begmatch is known to be nonzero also. | |
5527 begmatch + endmatch is how much we save by doing the ins/del. | |
5528 Is it worth it? */ | |
5529 | |
5530 if (nsp != osp | |
5531 && (!char_ins_del_ok | |
764 | 5532 || begmatch + endmatch <= char_ins_del_cost (frame)[nsp - osp])) |
314 | 5533 { |
5534 begmatch = 0; | |
5535 endmatch = 0; | |
5536 osp = nsp = min (osp, nsp); | |
5537 } | |
5538 | |
5539 /* Now go through the line, inserting, writing and | |
5540 deleting as appropriate. */ | |
5541 | |
5542 if (osp > nsp) | |
5543 { | |
5544 cursor_to (vpos, nsp); | |
5545 delete_glyphs (osp - nsp); | |
5546 } | |
5547 else if (nsp > osp) | |
5548 { | |
5549 /* If going to delete chars later in line | |
5550 and insert earlier in the line, | |
5551 must delete first to avoid losing data in the insert */ | |
5552 if (endmatch && nlen < olen + nsp - osp) | |
5553 { | |
5554 cursor_to (vpos, nlen - endmatch + osp - nsp); | |
5555 delete_glyphs (olen + nsp - osp - nlen); | |
5556 olen = nlen - (nsp - osp); | |
5557 } | |
5558 cursor_to (vpos, osp); | |
25012 | 5559 insert_glyphs (0, nsp - osp); |
314 | 5560 } |
5561 olen += nsp - osp; | |
5562 | |
5563 tem = nsp + begmatch + endmatch; | |
5564 if (nlen != tem || olen != tem) | |
5565 { | |
5566 cursor_to (vpos, nsp + begmatch); | |
5567 if (!endmatch || nlen == olen) | |
5568 { | |
5569 /* If new text being written reaches right margin, | |
5570 there is no need to do clear-to-eol at the end. | |
5571 (and it would not be safe, since cursor is not | |
5572 going to be "at the margin" after the text is done) */ | |
16267
05ca2cb9fe0f
(make_frame_glyphs, update_line, update_frame)
Richard M. Stallman <rms@gnu.org>
parents:
16256
diff
changeset
|
5573 if (nlen == FRAME_WINDOW_WIDTH (frame)) |
314 | 5574 olen = 0; |
5575 write_glyphs (nbody + nsp + begmatch, nlen - tem); | |
5576 } | |
5577 else if (nlen > olen) | |
5578 { | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5579 /* Here, we used to have the following simple code: |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5580 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5581 write_glyphs (nbody + nsp + begmatch, olen - tem); |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5582 insert_glyphs (nbody + nsp + begmatch + olen - tem, nlen - olen); |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5583 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5584 but it doesn't work if nbody[nsp + begmatch + olen - tem] |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5585 is a padding glyph. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5586 int out = olen - tem; /* Columns to be overwritten originally. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5587 int del; |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5588 |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5589 /* Calculate columns we can actually overwrite. */ |
25012 | 5590 while (CHAR_GLYPH_PADDING_P (nbody[nsp + begmatch + out])) out--; |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5591 write_glyphs (nbody + nsp + begmatch, out); |
25012 | 5592 /* If we left columns to be overwritten, we must delete them. */ |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5593 del = olen - tem - out; |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5594 if (del > 0) delete_glyphs (del); |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5595 /* At last, we insert columns not yet written out. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5596 insert_glyphs (nbody + nsp + begmatch + out, nlen - olen + del); |
314 | 5597 olen = nlen; |
5598 } | |
5599 else if (olen > nlen) | |
5600 { | |
5601 write_glyphs (nbody + nsp + begmatch, nlen - tem); | |
5602 delete_glyphs (olen - nlen); | |
5603 olen = nlen; | |
5604 } | |
5605 } | |
5606 | |
5607 just_erase: | |
5608 /* If any unerased characters remain after the new line, erase them. */ | |
5609 if (olen > nlen) | |
5610 { | |
5611 cursor_to (vpos, nlen); | |
5612 clear_end_of_line (olen); | |
5613 } | |
5614 | |
764 | 5615 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5616 make_current (desired_matrix, current_matrix, vpos); |
314 | 5617 } |
25012 | 5618 |
5619 | |
314 | 5620 |
25012 | 5621 /*********************************************************************** |
5622 X/Y Position -> Buffer Position | |
5623 ***********************************************************************/ | |
5624 | |
5625 /* Return the character position of the character at window relative | |
5626 pixel position (*X, *Y). *X and *Y are adjusted to character | |
5627 boundaries. */ | |
5628 | |
5629 int | |
5630 buffer_posn_from_coords (w, x, y) | |
5631 struct window *w; | |
5632 int *x, *y; | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5633 { |
25012 | 5634 struct it it; |
5635 struct buffer *old_current_buffer = current_buffer; | |
5636 struct text_pos startp; | |
5637 int left_area_width; | |
5638 | |
5639 current_buffer = XBUFFER (w->buffer); | |
5640 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
5641 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp))); | |
5642 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp))); | |
5643 start_display (&it, w, startp); | |
5644 | |
5645 left_area_width = WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH (w); | |
5646 move_it_to (&it, -1, *x + it.first_visible_x - left_area_width, *y, -1, | |
5647 MOVE_TO_X | MOVE_TO_Y); | |
5648 | |
5649 *x = it.current_x - it.first_visible_x + left_area_width; | |
5650 *y = it.current_y; | |
5651 current_buffer = old_current_buffer; | |
5652 return IT_CHARPOS (it); | |
5653 } | |
5654 | |
5655 | |
5656 /* Value is the string under window-relative coordinates X/Y in the | |
5657 mode or top line of window W, or nil if none. MODE_LINE_P non-zero | |
5658 means look at the mode line. *CHARPOS is set to the position in | |
5659 the string returned. */ | |
5660 | |
5661 Lisp_Object | |
5662 mode_line_string (w, x, y, mode_line_p, charpos) | |
5663 struct window *w; | |
30713
fee809f81f97
(mode_line_string): Declare parameter MODE_LINE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
30323
diff
changeset
|
5664 int x, y, mode_line_p; |
25012 | 5665 int *charpos; |
5666 { | |
5667 struct glyph_row *row; | |
5668 struct glyph *glyph, *end; | |
5669 struct frame *f = XFRAME (w->frame); | |
5670 int x0; | |
5671 Lisp_Object string = Qnil; | |
5672 | |
5673 if (mode_line_p) | |
5674 row = MATRIX_MODE_LINE_ROW (w->current_matrix); | |
5675 else | |
25546 | 5676 row = MATRIX_HEADER_LINE_ROW (w->current_matrix); |
25012 | 5677 |
5678 if (row->mode_line_p && row->enabled_p) | |
11919
31cb053405f2
(Fframe_or_buffer_changed_p): Record frame names
Karl Heuer <kwzh@gnu.org>
parents:
11914
diff
changeset
|
5679 { |
25012 | 5680 /* The mode lines are displayed over scroll bars and bitmap |
5681 areas, and X is window-relative. Correct X by the scroll bar | |
5682 and bitmap area width. */ | |
5683 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) | |
5684 x += FRAME_SCROLL_BAR_COLS (f) * CANON_X_UNIT (f); | |
25459
293b78b9ff60
(mode_line_string): Add FRAME_LEFT_FLAGS_AREA_WIDTH
Gerd Moellmann <gerd@gnu.org>
parents:
25385
diff
changeset
|
5685 x += FRAME_LEFT_FLAGS_AREA_WIDTH (f); |
25012 | 5686 |
5687 /* Find the glyph under X. If we find one with a string object, | |
5688 it's the one we were looking for. */ | |
5689 glyph = row->glyphs[TEXT_AREA]; | |
5690 end = glyph + row->used[TEXT_AREA]; | |
5691 for (x0 = 0; glyph < end; x0 += glyph->pixel_width, ++glyph) | |
5692 if (x >= x0 && x < x0 + glyph->pixel_width) | |
5693 { | |
5694 string = glyph->object; | |
5695 *charpos = glyph->charpos; | |
5696 break; | |
5697 } | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5698 } |
25012 | 5699 |
5700 return string; | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5701 } |
25012 | 5702 |
5703 | |
5704 /*********************************************************************** | |
5705 Changing Frame Sizes | |
5706 ***********************************************************************/ | |
314 | 5707 |
5708 #ifdef SIGWINCH | |
25012 | 5709 |
493 | 5710 SIGTYPE |
10745
a553a08f5785
(window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents:
10259
diff
changeset
|
5711 window_change_signal (signalnum) /* If we don't have an argument, */ |
25012 | 5712 int signalnum; /* some compilers complain in signal calls. */ |
314 | 5713 { |
5714 int width, height; | |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
5715 #ifndef USE_CRT_DLL |
314 | 5716 extern int errno; |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
5717 #endif |
314 | 5718 int old_errno = errno; |
5719 | |
764 | 5720 get_frame_size (&width, &height); |
314 | 5721 |
764 | 5722 /* The frame size change obviously applies to a termcap-controlled |
5723 frame. Find such a frame in the list, and assume it's the only | |
314 | 5724 one (since the redisplay code always writes to stdout, not a |
764 | 5725 FILE * specified in the frame structure). Record the new size, |
314 | 5726 but don't reallocate the data structures now. Let that be done |
5727 later outside of the signal handler. */ | |
5728 | |
5729 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5730 Lisp_Object tail, frame; |
314 | 5731 |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5732 FOR_EACH_FRAME (tail, frame) |
314 | 5733 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5734 if (FRAME_TERMCAP_P (XFRAME (frame))) |
314 | 5735 { |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5736 change_frame_size (XFRAME (frame), height, width, 0, 1, 0); |
314 | 5737 break; |
5738 } | |
5739 } | |
5740 } | |
5741 | |
5742 signal (SIGWINCH, window_change_signal); | |
5743 errno = old_errno; | |
5744 } | |
5745 #endif /* SIGWINCH */ | |
5746 | |
5747 | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5748 /* Do any change in frame size that was requested by a signal. SAFE |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5749 non-zero means this function is called from a place where it is |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5750 safe to change frame sizes while a redisplay is in progress. */ |
314 | 5751 |
21514 | 5752 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5753 do_pending_window_change (safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5754 int safe; |
314 | 5755 { |
5756 /* If window_change_signal should have run before, run it now. */ | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5757 if (redisplaying_p && !safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5758 return; |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5759 |
314 | 5760 while (delayed_size_change) |
5761 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5762 Lisp_Object tail, frame; |
314 | 5763 |
5764 delayed_size_change = 0; | |
5765 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5766 FOR_EACH_FRAME (tail, frame) |
314 | 5767 { |
25012 | 5768 struct frame *f = XFRAME (frame); |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5769 |
764 | 5770 int height = FRAME_NEW_HEIGHT (f); |
5771 int width = FRAME_NEW_WIDTH (f); | |
314 | 5772 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
5773 if (height != 0 || width != 0) |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5774 change_frame_size (f, height, width, 0, 0, safe); |
314 | 5775 } |
5776 } | |
5777 } | |
5778 | |
5779 | |
764 | 5780 /* Change the frame height and/or width. Values may be given as zero to |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5781 indicate no change is to take place. |
314 | 5782 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5783 If DELAY is non-zero, then assume we're being called from a signal |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5784 handler, and queue the change for later - perhaps the next |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5785 redisplay. Since this tries to resize windows, we can't call it |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5786 from a signal handler. |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5787 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5788 SAFE non-zero means this function is called from a place where it's |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5789 safe to change frame sizes while a redisplay is in progress. */ |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5790 |
21514 | 5791 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5792 change_frame_size (f, newheight, newwidth, pretend, delay, safe) |
25012 | 5793 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5794 int newheight, newwidth, pretend, delay, safe; |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5795 { |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5796 Lisp_Object tail, frame; |
16881
245ba9f2781a
(change_frame_size_1): Reject new sizes if they cause overflow.
Richard M. Stallman <rms@gnu.org>
parents:
16822
diff
changeset
|
5797 |
15395
b584c2db055f
(change_frame_size, remake_frame_glyphs): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15394
diff
changeset
|
5798 if (! FRAME_WINDOW_P (f)) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5799 { |
15394
8d01f71c4797
(Fredraw_frame, remake_frame_glyphs)
Richard M. Stallman <rms@gnu.org>
parents:
15282
diff
changeset
|
5800 /* When using termcap, or on MS-DOS, all frames use |
8d01f71c4797
(Fredraw_frame, remake_frame_glyphs)
Richard M. Stallman <rms@gnu.org>
parents:
15282
diff
changeset
|
5801 the same screen, so a change in size affects all frames. */ |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5802 FOR_EACH_FRAME (tail, frame) |
15395
b584c2db055f
(change_frame_size, remake_frame_glyphs): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15394
diff
changeset
|
5803 if (! FRAME_WINDOW_P (XFRAME (frame))) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5804 change_frame_size_1 (XFRAME (frame), newheight, newwidth, |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5805 pretend, delay, safe); |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5806 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5807 else |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5808 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe); |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5809 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5810 |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5811 static void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5812 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) |
25012 | 5813 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5814 int newheight, newwidth, pretend, delay, safe; |
314 | 5815 { |
16256
1ce0cb94fa68
(preserve_other_columns, preserve_my_columns): Use new
Richard M. Stallman <rms@gnu.org>
parents:
16195
diff
changeset
|
5816 int new_frame_window_width; |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
5817 int count = specpdl_ptr - specpdl; |
16881
245ba9f2781a
(change_frame_size_1): Reject new sizes if they cause overflow.
Richard M. Stallman <rms@gnu.org>
parents:
16822
diff
changeset
|
5818 |
314 | 5819 /* If we can't deal with the change now, queue it for later. */ |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5820 if (delay || (redisplaying_p && !safe)) |
314 | 5821 { |
25012 | 5822 FRAME_NEW_HEIGHT (f) = newheight; |
5823 FRAME_NEW_WIDTH (f) = newwidth; | |
314 | 5824 delayed_size_change = 1; |
5825 return; | |
5826 } | |
5827 | |
764 | 5828 /* This size-change overrides any pending one for this frame. */ |
25012 | 5829 FRAME_NEW_HEIGHT (f) = 0; |
5830 FRAME_NEW_WIDTH (f) = 0; | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5831 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
5832 /* If an argument is zero, set it to the current value. */ |
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
5833 if (newheight == 0) |
25012 | 5834 newheight = FRAME_HEIGHT (f); |
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
5835 if (newwidth == 0) |
25012 | 5836 newwidth = FRAME_WIDTH (f); |
5837 | |
5838 /* Compute width of windows in F. | |
5839 This is the width of the frame without vertical scroll bars. */ | |
5840 new_frame_window_width = FRAME_WINDOW_WIDTH_ARG (f, newwidth); | |
16881
245ba9f2781a
(change_frame_size_1): Reject new sizes if they cause overflow.
Richard M. Stallman <rms@gnu.org>
parents:
16822
diff
changeset
|
5841 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5842 /* Round up to the smallest acceptable size. */ |
25012 | 5843 check_frame_size (f, &newheight, &newwidth); |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5844 |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5845 /* If we're not changing the frame size, quit now. */ |
25012 | 5846 if (newheight == FRAME_HEIGHT (f) |
5847 && new_frame_window_width == FRAME_WINDOW_WIDTH (f)) | |
314 | 5848 return; |
5849 | |
15078 | 5850 BLOCK_INPUT; |
5851 | |
14286
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5852 #ifdef MSDOS |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5853 /* We only can set screen dimensions to certain values supported |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5854 by our video hardware. Try to find the smallest size greater |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5855 or equal to the requested dimensions. */ |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5856 dos_set_window_size (&newheight, &newwidth); |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5857 #endif |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5858 |
25012 | 5859 if (newheight != FRAME_HEIGHT (f)) |
314 | 5860 { |
25012 | 5861 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) |
314 | 5862 { |
25012 | 5863 /* Frame has both root and mini-buffer. */ |
5864 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top, | |
5865 FRAME_TOP_MARGIN (f)); | |
5866 set_window_height (FRAME_ROOT_WINDOW (f), | |
5867 (newheight | |
5868 - 1 | |
5869 - FRAME_TOP_MARGIN (f)), | |
5870 0); | |
5871 XSETFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top, | |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
5872 newheight - 1); |
25012 | 5873 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0); |
314 | 5874 } |
5875 else | |
764 | 5876 /* Frame has just one top-level window. */ |
25012 | 5877 set_window_height (FRAME_ROOT_WINDOW (f), |
5878 newheight - FRAME_TOP_MARGIN (f), 0); | |
5879 | |
5880 if (FRAME_TERMCAP_P (f) && !pretend) | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5881 FrameRows = newheight; |
314 | 5882 } |
5883 | |
25012 | 5884 if (new_frame_window_width != FRAME_WINDOW_WIDTH (f)) |
314 | 5885 { |
25012 | 5886 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_window_width, 0); |
5887 if (FRAME_HAS_MINIBUF_P (f)) | |
5888 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_window_width, 0); | |
5889 | |
5890 if (FRAME_TERMCAP_P (f) && !pretend) | |
764 | 5891 FrameCols = newwidth; |
25012 | 5892 |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
5893 if (WINDOWP (f->tool_bar_window)) |
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
5894 XSETFASTINT (XWINDOW (f->tool_bar_window)->width, newwidth); |
314 | 5895 } |
5896 | |
25012 | 5897 FRAME_HEIGHT (f) = newheight; |
5898 SET_FRAME_WIDTH (f, newwidth); | |
5899 | |
5900 { | |
5901 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
5902 int text_area_x, text_area_y, text_area_width, text_area_height; | |
5903 | |
5904 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width, | |
5905 &text_area_height); | |
5906 if (w->cursor.x >= text_area_x + text_area_width) | |
5907 w->cursor.hpos = w->cursor.x = 0; | |
5908 if (w->cursor.y >= text_area_y + text_area_height) | |
5909 w->cursor.vpos = w->cursor.y = 0; | |
5910 } | |
5911 | |
5912 adjust_glyphs (f); | |
5913 SET_FRAME_GARBAGED (f); | |
5914 calculate_costs (f); | |
15065 | 5915 |
5916 UNBLOCK_INPUT; | |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
5917 |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
5918 record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); |
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
5919 |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
5920 /* This isn't quite a no-op: it runs window-configuration-change-hook. */ |
25012 | 5921 Fset_window_buffer (FRAME_SELECTED_WINDOW (f), |
5922 XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer); | |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
5923 |
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
5924 unbind_to (count, Qnil); |
314 | 5925 } |
25012 | 5926 |
5927 | |
314 | 5928 |
25012 | 5929 /*********************************************************************** |
5930 Terminal Related Lisp Functions | |
5931 ***********************************************************************/ | |
5932 | |
5933 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript, | |
5934 1, 1, "FOpen termscript file: ", | |
5935 "Start writing all terminal output to FILE as well as the terminal.\n\ | |
5936 FILE = nil means just close any termscript file currently open.") | |
5937 (file) | |
5938 Lisp_Object file; | |
5939 { | |
5940 if (termscript != 0) fclose (termscript); | |
5941 termscript = 0; | |
5942 | |
5943 if (! NILP (file)) | |
5944 { | |
5945 file = Fexpand_file_name (file, Qnil); | |
5946 termscript = fopen (XSTRING (file)->data, "w"); | |
5947 if (termscript == 0) | |
5948 report_file_error ("Opening termscript", Fcons (file, Qnil)); | |
5949 } | |
5950 return Qnil; | |
5951 } | |
5952 | |
5953 | |
314 | 5954 DEFUN ("send-string-to-terminal", Fsend_string_to_terminal, |
5955 Ssend_string_to_terminal, 1, 1, 0, | |
5956 "Send STRING to the terminal without alteration.\n\ | |
5957 Control characters in STRING will have terminal-dependent effects.") | |
14068
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
5958 (string) |
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
5959 Lisp_Object string; |
314 | 5960 { |
20618
d5acac3af6e3
(Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents:
19627
diff
changeset
|
5961 /* ??? Perhaps we should do something special for multibyte strings here. */ |
14068
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
5962 CHECK_STRING (string, 0); |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5963 fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), stdout); |
314 | 5964 fflush (stdout); |
5965 if (termscript) | |
5966 { | |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5967 fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), |
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
5968 termscript); |
314 | 5969 fflush (termscript); |
5970 } | |
5971 return Qnil; | |
5972 } | |
5973 | |
25012 | 5974 |
314 | 5975 DEFUN ("ding", Fding, Sding, 0, 1, 0, |
5976 "Beep, or flash the screen.\n\ | |
5977 Also, unless an argument is given,\n\ | |
5978 terminate any keyboard macro currently executing.") | |
5979 (arg) | |
5980 Lisp_Object arg; | |
5981 { | |
493 | 5982 if (!NILP (arg)) |
314 | 5983 { |
649
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
5984 if (noninteractive) |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
5985 putchar (07); |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
5986 else |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
5987 ring_bell (); |
314 | 5988 fflush (stdout); |
5989 } | |
5990 else | |
5991 bitch_at_user (); | |
5992 | |
5993 return Qnil; | |
5994 } | |
5995 | |
21514 | 5996 void |
314 | 5997 bitch_at_user () |
5998 { | |
5999 if (noninteractive) | |
6000 putchar (07); | |
25012 | 6001 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ |
314 | 6002 error ("Keyboard macro terminated by a command ringing the bell"); |
6003 else | |
6004 ring_bell (); | |
6005 fflush (stdout); | |
6006 } | |
6007 | |
25012 | 6008 |
6009 | |
6010 /*********************************************************************** | |
6011 Sleeping, Waiting | |
6012 ***********************************************************************/ | |
6013 | |
314 | 6014 DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0, |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6015 "Pause, without updating display, for SECONDS seconds.\n\ |
2648 | 6016 SECONDS may be a floating-point value, meaning that you can wait for a\n\ |
6017 fraction of a second. Optional second arg MILLISECONDS specifies an\n\ | |
6018 additional wait period, in milliseconds; this may be useful if your\n\ | |
6019 Emacs was built without floating point support.\n\ | |
6020 \(Not all operating systems support waiting for a fraction of a second.)") | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6021 (seconds, milliseconds) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6022 Lisp_Object seconds, milliseconds; |
314 | 6023 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6024 int sec, usec; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6025 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6026 if (NILP (milliseconds)) |
9264
9338a124ea84
(redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents:
8903
diff
changeset
|
6027 XSETINT (milliseconds, 0); |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6028 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6029 CHECK_NUMBER (milliseconds, 1); |
2648 | 6030 usec = XINT (milliseconds) * 1000; |
6031 | |
6032 { | |
6033 double duration = extract_float (seconds); | |
6034 sec = (int) duration; | |
6035 usec += (duration - sec) * 1000000; | |
6036 } | |
314 | 6037 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6038 #ifndef EMACS_HAS_USECS |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6039 if (sec == 0 && usec != 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6040 error ("millisecond `sleep-for' not supported on %s", SYSTEM_TYPE); |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6041 #endif |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6042 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6043 /* Assure that 0 <= usec < 1000000. */ |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6044 if (usec < 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6045 { |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6046 /* We can't rely on the rounding being correct if user is negative. */ |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6047 if (-1000000 < usec) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6048 sec--, usec += 1000000; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6049 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6050 sec -= -usec / 1000000, usec = 1000000 - (-usec % 1000000); |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6051 } |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6052 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6053 sec += usec / 1000000, usec %= 1000000; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6054 |
14646
68fe10d1abd0
(Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents:
14459
diff
changeset
|
6055 if (sec < 0 || (sec == 0 && usec == 0)) |
314 | 6056 return Qnil; |
6057 | |
650 | 6058 { |
6059 Lisp_Object zero; | |
6060 | |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
6061 XSETFASTINT (zero, 0); |
650 | 6062 wait_reading_process_input (sec, usec, zero, 0); |
6063 } | |
587 | 6064 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6065 /* We should always have wait_reading_process_input; we have a dummy |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6066 implementation for systems which don't support subprocesses. */ |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6067 #if 0 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6068 /* No wait_reading_process_input */ |
314 | 6069 immediate_quit = 1; |
6070 QUIT; | |
6071 | |
6072 #ifdef VMS | |
6073 sys_sleep (sec); | |
6074 #else /* not VMS */ | |
6075 /* The reason this is done this way | |
6076 (rather than defined (H_S) && defined (H_T)) | |
6077 is because the VMS preprocessor doesn't grok `defined' */ | |
6078 #ifdef HAVE_SELECT | |
554 | 6079 EMACS_GET_TIME (end_time); |
6080 EMACS_SET_SECS_USECS (timeout, sec, usec); | |
587 | 6081 EMACS_ADD_TIME (end_time, end_time, timeout); |
554 | 6082 |
314 | 6083 while (1) |
6084 { | |
554 | 6085 EMACS_GET_TIME (timeout); |
6086 EMACS_SUB_TIME (timeout, end_time, timeout); | |
6087 if (EMACS_TIME_NEG_P (timeout) | |
6088 || !select (1, 0, 0, 0, &timeout)) | |
314 | 6089 break; |
6090 } | |
6091 #else /* not HAVE_SELECT */ | |
6092 sleep (sec); | |
6093 #endif /* HAVE_SELECT */ | |
6094 #endif /* not VMS */ | |
6095 | |
6096 immediate_quit = 0; | |
6097 #endif /* no subprocesses */ | |
6098 | |
6099 return Qnil; | |
6100 } | |
6101 | |
25012 | 6102 |
650 | 6103 /* This is just like wait_reading_process_input, except that |
6104 it does the redisplay. | |
6105 | |
5223
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
6106 It's also much like Fsit_for, except that it can be used for |
11411
91bcce2fd486
(Fframe_or_buffer_changed_p): Ignore buffers whose names start with space.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
6107 waiting for input as well. */ |
650 | 6108 |
6109 Lisp_Object | |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6110 sit_for (sec, usec, reading, display, initial_display) |
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6111 int sec, usec, reading, display, initial_display; |
314 | 6112 { |
650 | 6113 Lisp_Object read_kbd; |
314 | 6114 |
14964
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6115 swallow_events (display); |
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6116 |
14757
99125e1e8bac
(sit_for): Pass DISPLAY to detect_input_pending_run_timers.
Richard M. Stallman <rms@gnu.org>
parents:
14646
diff
changeset
|
6117 if (detect_input_pending_run_timers (display)) |
314 | 6118 return Qnil; |
650 | 6119 |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6120 if (initial_display) |
314 | 6121 redisplay_preserve_echo_area (); |
6122 | |
673 | 6123 if (sec == 0 && usec == 0) |
6124 return Qt; | |
6125 | |
314 | 6126 #ifdef SIGIO |
1915
98ecf99d7b1a
* dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
1872
diff
changeset
|
6127 gobble_input (0); |
650 | 6128 #endif |
6129 | |
9264
9338a124ea84
(redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents:
8903
diff
changeset
|
6130 XSETINT (read_kbd, reading ? -1 : 1); |
650 | 6131 wait_reading_process_input (sec, usec, read_kbd, display); |
6132 | |
314 | 6133 return detect_input_pending () ? Qnil : Qt; |
6134 } | |
6135 | |
25012 | 6136 |
650 | 6137 DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0, |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6138 "Perform redisplay, then wait for SECONDS seconds or until input is available.\n\ |
2648 | 6139 SECONDS may be a floating-point value, meaning that you can wait for a\n\ |
6140 fraction of a second. Optional second arg MILLISECONDS specifies an\n\ | |
6141 additional wait period, in milliseconds; this may be useful if your\n\ | |
6142 Emacs was built without floating point support.\n\ | |
6143 \(Not all operating systems support waiting for a fraction of a second.)\n\ | |
14068
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
6144 Optional third arg NODISP non-nil means don't redisplay, just wait for input.\n\ |
650 | 6145 Redisplay is preempted as always if input arrives, and does not happen\n\ |
6146 if input is available before it starts.\n\ | |
6147 Value is t if waited the full time with no input arriving.") | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6148 (seconds, milliseconds, nodisp) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6149 Lisp_Object seconds, milliseconds, nodisp; |
650 | 6150 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6151 int sec, usec; |
650 | 6152 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6153 if (NILP (milliseconds)) |
9264
9338a124ea84
(redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents:
8903
diff
changeset
|
6154 XSETINT (milliseconds, 0); |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6155 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6156 CHECK_NUMBER (milliseconds, 1); |
2648 | 6157 usec = XINT (milliseconds) * 1000; |
6158 | |
6159 { | |
6160 double duration = extract_float (seconds); | |
6161 sec = (int) duration; | |
6162 usec += (duration - sec) * 1000000; | |
6163 } | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6164 |
650 | 6165 #ifndef EMACS_HAS_USECS |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6166 if (usec != 0 && sec == 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6167 error ("millisecond `sit-for' not supported on %s", SYSTEM_TYPE); |
650 | 6168 #endif |
6169 | |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6170 return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp)); |
650 | 6171 } |
25012 | 6172 |
6173 | |
314 | 6174 |
25012 | 6175 /*********************************************************************** |
6176 Other Lisp Functions | |
6177 ***********************************************************************/ | |
6178 | |
6179 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the | |
6180 session's frames, frame names, buffers, buffer-read-only flags, and | |
6181 buffer-modified-flags, and a trailing sentinel (so we don't need to | |
6182 add length checks). */ | |
6183 | |
6184 static Lisp_Object frame_and_buffer_state; | |
6185 | |
6186 | |
6187 DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p, | |
6188 Sframe_or_buffer_changed_p, 0, 0, 0, | |
6189 "Return non-nil if the frame and buffer state appears to have changed.\n\ | |
6190 The state variable is an internal vector containing all frames and buffers,\n\ | |
6191 aside from buffers whose names start with space,\n\ | |
6192 along with the buffers' read-only and modified flags, which allows a fast\n\ | |
6193 check to see whether the menu bars might need to be recomputed.\n\ | |
6194 If this function returns non-nil, it updates the internal vector to reflect\n\ | |
6195 the current state.\n") | |
6196 () | |
6197 { | |
6198 Lisp_Object tail, frame, buf; | |
6199 Lisp_Object *vecp; | |
6200 int n; | |
6201 | |
6202 vecp = XVECTOR (frame_and_buffer_state)->contents; | |
6203 FOR_EACH_FRAME (tail, frame) | |
6204 { | |
6205 if (!EQ (*vecp++, frame)) | |
6206 goto changed; | |
6207 if (!EQ (*vecp++, XFRAME (frame)->name)) | |
6208 goto changed; | |
6209 } | |
6210 /* Check that the buffer info matches. | |
6211 No need to test for the end of the vector | |
6212 because the last element of the vector is lambda | |
6213 and that will always cause a mismatch. */ | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6214 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6215 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6216 buf = XCDR (XCAR (tail)); |
25012 | 6217 /* Ignore buffers that aren't included in buffer lists. */ |
6218 if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') | |
6219 continue; | |
6220 if (!EQ (*vecp++, buf)) | |
6221 goto changed; | |
6222 if (!EQ (*vecp++, XBUFFER (buf)->read_only)) | |
6223 goto changed; | |
6224 if (!EQ (*vecp++, Fbuffer_modified_p (buf))) | |
6225 goto changed; | |
6226 } | |
6227 /* Detect deletion of a buffer at the end of the list. */ | |
6228 if (EQ (*vecp, Qlambda)) | |
6229 return Qnil; | |
6230 changed: | |
6231 /* Start with 1 so there is room for at least one lambda at the end. */ | |
6232 n = 1; | |
6233 FOR_EACH_FRAME (tail, frame) | |
6234 n += 2; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6235 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6236 n += 3; |
6237 /* Reallocate the vector if it's grown, or if it's shrunk a lot. */ | |
6238 if (n > XVECTOR (frame_and_buffer_state)->size | |
6239 || n + 20 < XVECTOR (frame_and_buffer_state)->size / 2) | |
6240 /* Add 20 extra so we grow it less often. */ | |
6241 frame_and_buffer_state = Fmake_vector (make_number (n + 20), Qlambda); | |
6242 vecp = XVECTOR (frame_and_buffer_state)->contents; | |
6243 FOR_EACH_FRAME (tail, frame) | |
6244 { | |
6245 *vecp++ = frame; | |
6246 *vecp++ = XFRAME (frame)->name; | |
6247 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6248 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6249 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6250 buf = XCDR (XCAR (tail)); |
25012 | 6251 /* Ignore buffers that aren't included in buffer lists. */ |
6252 if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') | |
6253 continue; | |
6254 *vecp++ = buf; | |
6255 *vecp++ = XBUFFER (buf)->read_only; | |
6256 *vecp++ = Fbuffer_modified_p (buf); | |
6257 } | |
6258 /* Fill up the vector with lambdas (always at least one). */ | |
6259 *vecp++ = Qlambda; | |
6260 while (vecp - XVECTOR (frame_and_buffer_state)->contents | |
6261 < XVECTOR (frame_and_buffer_state)->size) | |
6262 *vecp++ = Qlambda; | |
6263 /* Make sure we didn't overflow the vector. */ | |
6264 if (vecp - XVECTOR (frame_and_buffer_state)->contents | |
6265 > XVECTOR (frame_and_buffer_state)->size) | |
6266 abort (); | |
6267 return Qt; | |
6268 } | |
6269 | |
6270 | |
6271 | |
6272 /*********************************************************************** | |
6273 Initialization | |
6274 ***********************************************************************/ | |
6275 | |
314 | 6276 char *terminal_type; |
6277 | |
25012 | 6278 /* Initialization done when Emacs fork is started, before doing stty. |
6279 Determine terminal type and set terminal_driver. Then invoke its | |
6280 decoding routine to set up variables in the terminal package. */ | |
314 | 6281 |
21514 | 6282 void |
314 | 6283 init_display () |
6284 { | |
6285 #ifdef HAVE_X_WINDOWS | |
6286 extern int display_arg; | |
6287 #endif | |
6288 | |
25012 | 6289 /* Construct the space glyph. */ |
6290 space_glyph.type = CHAR_GLYPH; | |
6291 SET_CHAR_GLYPH_FROM_GLYPH (space_glyph, ' '); | |
6292 space_glyph.charpos = -1; | |
6293 | |
314 | 6294 meta_key = 0; |
6295 inverse_video = 0; | |
6296 cursor_in_echo_area = 0; | |
6297 terminal_type = (char *) 0; | |
6298 | |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6299 /* Now is the time to initialize this; it's used by init_sys_modes |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6300 during startup. */ |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6301 Vwindow_system = Qnil; |
314 | 6302 |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6303 /* If the user wants to use a window system, we shouldn't bother |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6304 initializing the terminal. This is especially important when the |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6305 terminal is so dumb that emacs gives up before and doesn't bother |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6306 using the window system. |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6307 |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6308 If the DISPLAY environment variable is set and nonempty, |
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6309 try to use X, and die with an error message if that doesn't work. */ |
314 | 6310 |
6311 #ifdef HAVE_X_WINDOWS | |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6312 if (! display_arg) |
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6313 { |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6314 char *display; |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6315 #ifdef VMS |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6316 display = getenv ("DECW$DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6317 #else |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6318 display = getenv ("DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6319 #endif |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6320 |
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6321 display_arg = (display != 0 && *display != 0); |
2364 | 6322 } |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6323 |
18774
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6324 if (!inhibit_window_system && display_arg |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6325 #ifndef CANNOT_DUMP |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6326 && initialized |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6327 #endif |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6328 ) |
314 | 6329 { |
6330 Vwindow_system = intern ("x"); | |
6331 #ifdef HAVE_X11 | |
6332 Vwindow_system_version = make_number (11); | |
6333 #else | |
6334 Vwindow_system_version = make_number (10); | |
6335 #endif | |
15273
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6336 #if defined (LINUX) && defined (HAVE_LIBNCURSES) |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6337 /* In some versions of ncurses, |
15282 | 6338 tputs crashes if we have not called tgetent. |
15273
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6339 So call tgetent. */ |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6340 { char b[2044]; tgetent (b, "xterm");} |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6341 #endif |
25012 | 6342 adjust_frame_glyphs_initially (); |
314 | 6343 return; |
6344 } | |
6345 #endif /* HAVE_X_WINDOWS */ | |
6346 | |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6347 #ifdef HAVE_NTGUI |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6348 if (!inhibit_window_system) |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6349 { |
16589
ec300a10e407
(init_display) [HAVE_NTGUI]: Use w32 for window-system.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16412
diff
changeset
|
6350 Vwindow_system = intern ("w32"); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6351 Vwindow_system_version = make_number (1); |
25012 | 6352 adjust_frame_glyphs_initially (); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6353 return; |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6354 } |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6355 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6356 |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6357 #ifdef macintosh |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6358 if (!inhibit_window_system) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6359 { |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6360 Vwindow_system = intern ("mac"); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6361 Vwindow_system_version = make_number (1); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6362 adjust_frame_glyphs_initially (); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6363 return; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6364 } |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6365 #endif /* macintosh */ |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6366 |
314 | 6367 /* If no window system has been specified, try to use the terminal. */ |
6368 if (! isatty (0)) | |
6369 { | |
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
6370 fatal ("standard input is not a tty"); |
314 | 6371 exit (1); |
6372 } | |
6373 | |
6374 /* Look at the TERM variable */ | |
6375 terminal_type = (char *) getenv ("TERM"); | |
6376 if (!terminal_type) | |
6377 { | |
6378 #ifdef VMS | |
6379 fprintf (stderr, "Please specify your terminal type.\n\ | |
6380 For types defined in VMS, use set term /device=TYPE.\n\ | |
6381 For types not defined in VMS, use define emacs_term \"TYPE\".\n\ | |
6382 \(The quotation marks are necessary since terminal types are lower case.)\n"); | |
6383 #else | |
6384 fprintf (stderr, "Please set the environment variable TERM; see tset(1).\n"); | |
6385 #endif | |
6386 exit (1); | |
6387 } | |
6388 | |
6389 #ifdef VMS | |
25012 | 6390 /* VMS DCL tends to up-case things, so down-case term type. |
314 | 6391 Hardly any uppercase letters in terminal types; should be none. */ |
6392 { | |
6393 char *new = (char *) xmalloc (strlen (terminal_type) + 1); | |
6394 char *p; | |
6395 | |
6396 strcpy (new, terminal_type); | |
6397 | |
6398 for (p = new; *p; p++) | |
6399 if (isupper (*p)) | |
6400 *p = tolower (*p); | |
6401 | |
6402 terminal_type = new; | |
6403 } | |
25012 | 6404 #endif /* VMS */ |
314 | 6405 |
6406 term_init (terminal_type); | |
25012 | 6407 |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6408 { |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6409 struct frame *sf = SELECTED_FRAME (); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6410 int width = FRAME_WINDOW_WIDTH (sf); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6411 int height = FRAME_HEIGHT (sf); |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6412 |
25012 | 6413 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph); |
6414 | |
6415 /* If these sizes are so big they cause overflow, just ignore the | |
6416 change. It's not clear what better we could do. */ | |
6417 if (total_glyphs / sizeof (struct glyph) / height != width + 2) | |
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
6418 fatal ("screen size %dx%d too big", width, height); |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6419 } |
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6420 |
25012 | 6421 adjust_frame_glyphs_initially (); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6422 calculate_costs (XFRAME (selected_frame)); |
314 | 6423 |
6424 #ifdef SIGWINCH | |
6425 #ifndef CANNOT_DUMP | |
6426 if (initialized) | |
6427 #endif /* CANNOT_DUMP */ | |
6428 signal (SIGWINCH, window_change_signal); | |
6429 #endif /* SIGWINCH */ | |
25012 | 6430 |
6431 /* Set up faces of the initial terminal frame of a dumped Emacs. */ | |
6432 if (initialized | |
6433 && !noninteractive | |
25118
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6434 #ifdef MSDOS |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6435 /* The MSDOS terminal turns on its ``window system'' relatively |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6436 late into the startup, so we cannot do the frame faces' |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6437 initialization just yet. It will be done later by pc-win.el |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6438 and internal_terminal_init. */ |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6439 && (strcmp (terminal_type, "internal") != 0 || inhibit_window_system) |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6440 #endif |
25012 | 6441 && NILP (Vwindow_system)) |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6442 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6443 /* For the initial frame, we don't have any way of knowing what |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6444 are the foreground and background colors of the terminal. */ |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6445 struct frame *sf = SELECTED_FRAME(); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6446 |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
6447 FRAME_FOREGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_FG_COLOR; |
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
6448 FRAME_BACKGROUND_PIXEL (sf) = FACE_TTY_DEFAULT_BG_COLOR; |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6449 call0 (intern ("tty-set-up-initial-frame-faces")); |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6450 } |
314 | 6451 } |
25012 | 6452 |
6453 | |
314 | 6454 |
25012 | 6455 /*********************************************************************** |
6456 Blinking cursor | |
6457 ***********************************************************************/ | |
6458 | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6459 DEFUN ("internal-show-cursor", Finternal_show_cursor, |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6460 Sinternal_show_cursor, 2, 2, 0, |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6461 "Set the cursor-visibility flag of WINDOW to SHOW.\n\ |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6462 WINDOW nil means use the selected window. SHOW non-nil means\n\ |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6463 show a cursor in WINDOW in the next redisplay. SHOW nil means\n\ |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6464 don't show a cursor.") |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6465 (window, show) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6466 Lisp_Object window, show; |
25012 | 6467 { |
6468 /* Don't change cursor state while redisplaying. This could confuse | |
6469 output routines. */ | |
6470 if (!redisplaying_p) | |
6471 { | |
6472 if (NILP (window)) | |
6473 window = selected_window; | |
6474 else | |
6475 CHECK_WINDOW (window, 2); | |
6476 | |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6477 XWINDOW (window)->cursor_off_p = NILP (show); |
25012 | 6478 } |
6479 | |
6480 return Qnil; | |
6481 } | |
6482 | |
6483 | |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6484 DEFUN ("internal-show-cursor-p", Finternal_show_cursor_p, |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6485 Sinternal_show_cursor_p, 0, 1, 0, |
26499
10af169a628b
(Finternal_show_cursor_p): Fix doc string.
Dave Love <fx@gnu.org>
parents:
26334
diff
changeset
|
6486 "Value is non-nil if next redisplay will display a cursor in WINDOW.\n\ |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6487 WINDOW nil or omitted means report on the selected window.") |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6488 (window) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6489 Lisp_Object window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6490 { |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6491 struct window *w; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6492 |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6493 if (NILP (window)) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6494 window = selected_window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6495 else |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6496 CHECK_WINDOW (window, 2); |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6497 |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6498 w = XWINDOW (window); |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6499 return w->cursor_off_p ? Qnil : Qt; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6500 } |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6501 |
25012 | 6502 |
6503 /*********************************************************************** | |
6504 Initialization | |
6505 ***********************************************************************/ | |
6506 | |
21514 | 6507 void |
314 | 6508 syms_of_display () |
6509 { | |
764 | 6510 defsubr (&Sredraw_frame); |
314 | 6511 defsubr (&Sredraw_display); |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6512 defsubr (&Sframe_or_buffer_changed_p); |
314 | 6513 defsubr (&Sopen_termscript); |
6514 defsubr (&Sding); | |
6515 defsubr (&Ssit_for); | |
6516 defsubr (&Ssleep_for); | |
6517 defsubr (&Ssend_string_to_terminal); | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6518 defsubr (&Sinternal_show_cursor); |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6519 defsubr (&Sinternal_show_cursor_p); |
314 | 6520 |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
6521 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6522 defsubr (&Sdump_redisplay_history); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6523 #endif |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6524 |
12186
6811992e871c
(Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents:
11919
diff
changeset
|
6525 frame_and_buffer_state = Fmake_vector (make_number (20), Qlambda); |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6526 staticpro (&frame_and_buffer_state); |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6527 |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6528 Qdisplay_table = intern ("display-table"); |
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6529 staticpro (&Qdisplay_table); |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6530 Qredisplay_dont_pause = intern ("redisplay-dont-pause"); |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6531 staticpro (&Qredisplay_dont_pause); |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6532 |
314 | 6533 DEFVAR_INT ("baud-rate", &baud_rate, |
7926
b87f2c705501
(syms_of_display): Make baud-rate a user var.
Richard M. Stallman <rms@gnu.org>
parents:
7900
diff
changeset
|
6534 "*The output baud rate of the terminal.\n\ |
314 | 6535 On most systems, changing this value will affect the amount of padding\n\ |
6536 and the other strategic decisions made during redisplay."); | |
25012 | 6537 |
314 | 6538 DEFVAR_BOOL ("inverse-video", &inverse_video, |
764 | 6539 "*Non-nil means invert the entire frame display.\n\ |
314 | 6540 This means everything is in inverse video which otherwise would not be."); |
25012 | 6541 |
314 | 6542 DEFVAR_BOOL ("visible-bell", &visible_bell, |
764 | 6543 "*Non-nil means try to flash the frame to represent a bell."); |
25012 | 6544 |
314 | 6545 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, |
764 | 6546 "*Non-nil means no need to redraw entire frame after suspending.\n\ |
314 | 6547 A non-nil value is useful if the terminal can automatically preserve\n\ |
764 | 6548 Emacs's frame display when you reenter Emacs.\n\ |
314 | 6549 It is up to you to set this variable if your terminal can do that."); |
25012 | 6550 |
314 | 6551 DEFVAR_LISP ("window-system", &Vwindow_system, |
6552 "A symbol naming the window-system under which Emacs is running\n\ | |
6553 \(such as `x'), or nil if emacs is running on an ordinary terminal."); | |
25012 | 6554 |
314 | 6555 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, |
6556 "The version number of the window system in use.\n\ | |
6557 For X windows, this is 10 or 11."); | |
25012 | 6558 |
314 | 6559 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, |
6560 "Non-nil means put cursor in minibuffer, at end of any message there."); | |
25012 | 6561 |
314 | 6562 DEFVAR_LISP ("glyph-table", &Vglyph_table, |
764 | 6563 "Table defining how to output a glyph code to the frame.\n\ |
314 | 6564 If not nil, this is a vector indexed by glyph code to define the glyph.\n\ |
6565 Each element can be:\n\ | |
6566 integer: a glyph code which this glyph is an alias for.\n\ | |
6567 string: output this glyph using that string (not impl. in X windows).\n\ | |
6568 nil: this glyph mod 256 is char code to output,\n\ | |
6857 | 6569 and this glyph / 256 is face code for X windows (see `face-id')."); |
314 | 6570 Vglyph_table = Qnil; |
6571 | |
6572 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table, | |
6573 "Display table to use for buffers that specify none.\n\ | |
6574 See `buffer-display-table' for more information."); | |
6575 Vstandard_display_table = Qnil; | |
6576 | |
25012 | 6577 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause, |
6578 "*Non-nil means update isn't paused when input is detected."); | |
6579 redisplay_dont_pause = 0; | |
6580 | |
314 | 6581 /* Initialize `window-system', unless init_display already decided it. */ |
6582 #ifdef CANNOT_DUMP | |
6583 if (noninteractive) | |
6584 #endif | |
6585 { | |
6586 Vwindow_system = Qnil; | |
6587 Vwindow_system_version = Qnil; | |
6588 } | |
6589 } |