Mercurial > emacs
annotate src/dispnew.c @ 37444:d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
(replace-rectangle): Make it an alias for string-rectangle.
(string-insert-rectangle): New function.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Tue, 24 Apr 2001 10:56:26 +0000 |
parents | e293840c7332 |
children | db78c8220a21 |
rev | line source |
---|---|
314 | 1 /* Updating of data structures for redisplay. |
36392
88b90fa71d23
Check HAVE_TERM_H before including term.h.
Gerd Moellmann <gerd@gnu.org>
parents:
36279
diff
changeset
|
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 1999, 2000, 2001 |
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 | |
36392
88b90fa71d23
Check HAVE_TERM_H before including term.h.
Gerd Moellmann <gerd@gnu.org>
parents:
36279
diff
changeset
|
107 #if defined(HAVE_TERM_H) && defined (LINUX) && defined (HAVE_LIBNCURSES) |
29437 | 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 | |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
123 static struct glyph_matrix *save_current_matrix P_ ((struct frame *)); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
124 static void restore_current_matrix P_ ((struct frame *, struct glyph_matrix *)); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
125 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
|
126 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
|
127 static void redraw_overlapped_rows P_ ((struct window *, int)); |
25012 | 128 static int count_blanks P_ ((struct glyph *, int)); |
129 static int count_match P_ ((struct glyph *, struct glyph *, | |
130 struct glyph *, struct glyph *)); | |
131 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int)); | |
132 static void update_frame_line P_ ((struct frame *, int)); | |
133 static struct dim allocate_matrices_for_frame_redisplay | |
134 P_ ((Lisp_Object, int, int, struct dim, int, int *)); | |
135 static void allocate_matrices_for_window_redisplay P_ ((struct window *, | |
136 struct dim)); | |
137 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim)); | |
138 static void adjust_frame_glyphs P_ ((struct frame *)); | |
139 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *)); | |
140 static void free_glyph_matrix P_ ((struct glyph_matrix *)); | |
141 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *, | |
142 int, int, struct dim)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
143 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); |
25012 | 144 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
|
145 #if GLYPH_DEBUG |
25012 | 146 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
|
147 #endif |
25012 | 148 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); |
149 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *, | |
150 struct window *)); | |
151 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *, | |
152 struct window *)); | |
153 static struct glyph_pool *new_glyph_pool P_ ((void)); | |
154 static void free_glyph_pool P_ ((struct glyph_pool *)); | |
155 static void adjust_frame_glyphs_initially P_ ((void)); | |
156 static void adjust_frame_message_buffer P_ ((struct frame *)); | |
157 static void adjust_decode_mode_spec_buffer P_ ((struct frame *)); | |
158 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *)); | |
159 static void build_frame_matrix P_ ((struct frame *)); | |
160 void clear_current_matrices P_ ((struct frame *)); | |
161 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int, | |
162 int, int)); | |
163 static void clear_window_matrices P_ ((struct window *, int)); | |
164 static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int)); | |
165 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
|
166 static int update_window_line P_ ((struct window *, int, int *)); |
25012 | 167 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
|
168 static int update_text_area P_ ((struct window *, int)); |
25012 | 169 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *, |
170 int)); | |
171 static void mirror_make_current P_ ((struct window *, int)); | |
172 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
|
173 #if GLYPH_DEBUG |
25012 | 174 static void check_matrix_pointers P_ ((struct glyph_matrix *, |
175 struct glyph_matrix *)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
176 #endif |
25012 | 177 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *)); |
178 static int update_window_tree P_ ((struct window *, int)); | |
179 static int update_window P_ ((struct window *, int)); | |
180 static int update_frame_1 P_ ((struct frame *, int, int)); | |
181 static void set_window_cursor_after_update P_ ((struct window *)); | |
182 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
|
183 struct glyph_row *, int)); |
25012 | 184 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *)); |
185 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *)); | |
186 static void reverse_rows P_ ((struct glyph_matrix *, int, int)); | |
187 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
|
188 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
|
189 struct window *frame_row_to_window P_ ((struct window *, int)); |
25012 | 190 |
191 | |
192 /* Non-zero means don't pause redisplay for pending input. (This is | |
193 for debugging and for a future implementation of EDT-like | |
194 scrolling. */ | |
195 | |
196 int redisplay_dont_pause; | |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
197 |
554 | 198 /* Nonzero upon entry to redisplay means do not assume anything about |
764 | 199 current contents of actual terminal frame; clear and redraw it. */ |
314 | 200 |
764 | 201 int frame_garbaged; |
314 | 202 |
25012 | 203 /* Nonzero means last display completed. Zero means it was preempted. */ |
314 | 204 |
205 int display_completed; | |
206 | |
25012 | 207 /* Lisp variable visible-bell; enables use of screen-flash instead of |
208 audible bell. */ | |
314 | 209 |
210 int visible_bell; | |
211 | |
764 | 212 /* Invert the color of the whole frame, at a low level. */ |
314 | 213 |
214 int inverse_video; | |
215 | |
216 /* Line speed of the terminal. */ | |
217 | |
218 int baud_rate; | |
219 | |
25012 | 220 /* Either nil or a symbol naming the window system under which Emacs |
221 is running. */ | |
314 | 222 |
223 Lisp_Object Vwindow_system; | |
224 | |
225 /* Version number of X windows: 10, 11 or nil. */ | |
25012 | 226 |
314 | 227 Lisp_Object Vwindow_system_version; |
228 | |
25012 | 229 /* Vector of glyph definitions. Indexed by glyph number, the contents |
230 are a string which is how to output the glyph. | |
314 | 231 |
232 If Vglyph_table is nil, a glyph is output by using its low 8 bits | |
25012 | 233 as a character code. |
234 | |
235 This is an obsolete feature that is no longer used. The variable | |
236 is retained for compatibility. */ | |
314 | 237 |
238 Lisp_Object Vglyph_table; | |
239 | |
240 /* Display table to use for vectors that don't specify their own. */ | |
241 | |
242 Lisp_Object Vstandard_display_table; | |
243 | |
25012 | 244 /* Nonzero means reading single-character input with prompt so put |
245 cursor on mini-buffer after the prompt. positive means at end of | |
246 text in echo area; negative means at beginning of line. */ | |
247 | |
314 | 248 int cursor_in_echo_area; |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
249 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
250 Lisp_Object Qdisplay_table, Qredisplay_dont_pause; |
25012 | 251 |
314 | 252 |
25012 | 253 /* 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
|
254 variable always equals the_only_frame. */ |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
255 |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
256 Lisp_Object selected_frame; |
25012 | 257 |
258 /* A frame which is not just a mini-buffer, or 0 if there are no such | |
764 | 259 frames. This is usually the most recent such frame that was |
9572 | 260 selected. In a single-frame version, this variable always holds |
261 the address of the_only_frame. */ | |
25012 | 262 |
263 struct frame *last_nonminibuf_frame; | |
264 | |
265 /* Stdio stream being used for copy of all output. */ | |
266 | |
267 FILE *termscript; | |
268 | |
269 /* Structure for info on cursor positioning. */ | |
270 | |
271 struct cm Wcm; | |
272 | |
273 /* 1 means SIGWINCH happened when not safe. */ | |
274 | |
275 int delayed_size_change; | |
276 | |
277 /* 1 means glyph initialization has been completed at startup. */ | |
278 | |
279 static int glyphs_initialized_initially_p; | |
280 | |
281 /* Updated window if != 0. Set by update_window. */ | |
282 | |
283 struct window *updated_window; | |
284 | |
285 /* Glyph row updated in update_window_line, and area that is updated. */ | |
286 | |
287 struct glyph_row *updated_row; | |
288 int updated_area; | |
289 | |
290 /* A glyph for a space. */ | |
291 | |
292 struct glyph space_glyph; | |
293 | |
294 /* Non-zero means update has been performed directly, so that there's | |
295 no need for redisplay_internal to do much work. Set by | |
296 direct_output_for_insert. */ | |
297 | |
298 int redisplay_performed_directly_p; | |
299 | |
300 /* Counts of allocated structures. These counts serve to diagnose | |
301 memory leaks and double frees. */ | |
302 | |
303 int glyph_matrix_count; | |
304 int glyph_pool_count; | |
305 | |
306 /* If non-null, the frame whose frame matrices are manipulated. If | |
307 null, window matrices are worked on. */ | |
308 | |
309 static struct frame *frame_matrix_frame; | |
310 | |
311 /* Current interface for window-based redisplay. Set from init_xterm. | |
312 A null value means we are not using window-based redisplay. */ | |
313 | |
314 struct redisplay_interface *rif; | |
315 | |
316 /* Non-zero means that fonts have been loaded since the last glyph | |
317 matrix adjustments. Redisplay must stop, and glyph matrices must | |
318 be adjusted when this flag becomes non-zero during display. The | |
319 reason fonts can be loaded so late is that fonts of fontsets are | |
320 loaded on demand. */ | |
321 | |
322 int fonts_changed_p; | |
323 | |
324 /* Convert vpos and hpos from frame to window and vice versa. | |
325 This may only be used for terminal frames. */ | |
326 | |
327 #if GLYPH_DEBUG | |
328 | |
329 static int window_to_frame_vpos P_ ((struct window *, int)); | |
330 static int window_to_frame_hpos P_ ((struct window *, int)); | |
331 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) | |
332 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) | |
333 | |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
334 /* 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
|
335 information. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
336 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
337 struct redisplay_history |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
338 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
339 char trace[512 + 100]; |
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 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
342 /* The size of the history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
343 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
344 #define REDISPLAY_HISTORY_SIZE 30 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
345 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
346 /* The redisplay history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
347 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
348 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
|
349 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
350 /* Next free entry in redisplay_history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
351 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
352 static int history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
353 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
354 /* 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
|
355 history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
356 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
357 static unsigned history_tick; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
358 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
359 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
|
360 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
|
361 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
362 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
363 /* 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
|
364 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
|
365 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
|
366 has been interrupted for pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
367 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
368 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
369 add_window_display_history (w, msg, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
370 struct window *w; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
371 char *msg; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
372 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
373 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
374 char *buf; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
375 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
376 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
377 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
378 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
379 ++history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
380 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
381 sprintf (buf, "%d: window %p (`%s')%s\n", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
382 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
383 w, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
384 ((BUFFERP (w->buffer) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
385 && STRINGP (XBUFFER (w->buffer)->name)) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
386 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
387 : "???"), |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
388 paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
389 strcat (buf, msg); |
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 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
393 /* 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
|
394 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
|
395 pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
396 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
397 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
398 add_frame_display_history (f, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
399 struct frame *f; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
400 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
401 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
402 char *buf; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
403 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
404 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
405 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
406 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
407 ++history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
408 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
409 sprintf (buf, "%d: update frame %p%s", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
410 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
411 f, paused_p ? " ***paused***" : ""); |
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 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
415 DEFUN ("dump-redisplay-history", Fdump_redisplay_history, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
416 Sdump_redisplay_history, 0, 0, "", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
417 "Dump redisplay history to stderr.") |
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 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
420 int i; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
421 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
422 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
|
423 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
424 if (i < 0) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
425 i = REDISPLAY_HISTORY_SIZE - 1; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
426 fprintf (stderr, "%s\n", redisplay_history[i].trace); |
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 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
429 return Qnil; |
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 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
432 |
25012 | 433 #else /* GLYPH_DEBUG == 0 */ |
434 | |
435 #define WINDOW_TO_FRAME_VPOS(W, VPOS) ((VPOS) + XFASTINT ((W)->top)) | |
436 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + XFASTINT ((W)->left)) | |
437 | |
438 #endif /* GLYPH_DEBUG == 0 */ | |
439 | |
440 | |
441 /* Like bcopy except never gets confused by overlap. Let this be the | |
442 first function defined in this file, or change emacs.c where the | |
443 address of this function is used. */ | |
314 | 444 |
445 void | |
446 safe_bcopy (from, to, size) | |
447 char *from, *to; | |
448 int size; | |
449 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
450 if (size <= 0 || from == to) |
314 | 451 return; |
452 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
453 /* 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
|
454 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
|
455 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
|
456 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
|
457 bcopy (from, to, size); |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
458 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
459 /* 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
|
460 else |
314 | 461 { |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
462 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
|
463 register char *endt = to + size; |
314 | 464 |
465 /* If TO - FROM is large, then we should break the copy into | |
466 nonoverlapping chunks of TO - FROM bytes each. However, if | |
467 TO - FROM is small, then the bcopy function call overhead | |
468 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
|
469 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
|
470 bad, I'm trying to err in its favor. */ |
314 | 471 if (to - from < 64) |
472 { | |
473 do | |
474 *--endt = *--endf; | |
475 while (endf != from); | |
476 } | |
477 else | |
478 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
479 for (;;) |
314 | 480 { |
481 endt -= (to - from); | |
482 endf -= (to - from); | |
483 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
484 if (endt < to) |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
485 break; |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
486 |
314 | 487 bcopy (endf, endt, to - from); |
488 } | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
489 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
490 /* If SIZE wasn't a multiple of TO - FROM, there will be a |
25012 | 491 little left over. The amount left over is (endt + (to - |
492 from)) - to, which is endt - from. */ | |
314 | 493 bcopy (from, to, endt - from); |
494 } | |
495 } | |
496 } | |
497 | |
25012 | 498 |
499 | |
500 /*********************************************************************** | |
501 Glyph Matrices | |
502 ***********************************************************************/ | |
503 | |
504 /* Allocate and return a glyph_matrix structure. POOL is the glyph | |
505 pool from which memory for the matrix should be allocated, or null | |
506 for window-based redisplay where no glyph pools are used. The | |
507 member `pool' of the glyph matrix structure returned is set to | |
508 POOL, the structure is otherwise zeroed. */ | |
509 | |
510 struct glyph_matrix * | |
511 new_glyph_matrix (pool) | |
512 struct glyph_pool *pool; | |
513 { | |
514 struct glyph_matrix *result; | |
515 | |
516 /* Allocate and clear. */ | |
517 result = (struct glyph_matrix *) xmalloc (sizeof *result); | |
518 bzero (result, sizeof *result); | |
519 | |
520 /* Increment number of allocated matrices. This count is used | |
521 to detect memory leaks. */ | |
522 ++glyph_matrix_count; | |
523 | |
524 /* Set pool and return. */ | |
525 result->pool = pool; | |
526 return result; | |
527 } | |
528 | |
529 | |
530 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed. | |
531 | |
532 The global counter glyph_matrix_count is decremented when a matrix | |
533 is freed. If the count gets negative, more structures were freed | |
534 than allocated, i.e. one matrix was freed more than once or a bogus | |
535 pointer was passed to this function. | |
536 | |
537 If MATRIX->pool is null, this means that the matrix manages its own | |
538 glyph memory---this is done for matrices on X frames. Freeing the | |
539 matrix also frees the glyph memory in this case. */ | |
540 | |
541 static void | |
542 free_glyph_matrix (matrix) | |
543 struct glyph_matrix *matrix; | |
544 { | |
545 if (matrix) | |
546 { | |
547 int i; | |
548 | |
549 /* Detect the case that more matrices are freed than were | |
550 allocated. */ | |
551 if (--glyph_matrix_count < 0) | |
552 abort (); | |
553 | |
554 /* Free glyph memory if MATRIX owns it. */ | |
555 if (matrix->pool == NULL) | |
556 for (i = 0; i < matrix->rows_allocated; ++i) | |
557 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]); | |
558 | |
559 /* Free row structures and the matrix itself. */ | |
560 xfree (matrix->rows); | |
561 xfree (matrix); | |
562 } | |
563 } | |
564 | |
565 | |
566 /* Return the number of glyphs to reserve for a marginal area of | |
567 window W. TOTAL_GLYPHS is the number of glyphs in a complete | |
568 display line of window W. MARGIN gives the width of the marginal | |
569 area in canonical character units. MARGIN should be an integer | |
570 or a float. */ | |
571 | |
572 static int | |
573 margin_glyphs_to_reserve (w, total_glyphs, margin) | |
574 struct window *w; | |
575 int total_glyphs; | |
576 Lisp_Object margin; | |
577 { | |
578 int n; | |
579 | |
580 if (NUMBERP (margin)) | |
581 { | |
582 int width = XFASTINT (w->width); | |
583 double d = max (0, XFLOATINT (margin)); | |
584 d = min (width / 2 - 1, d); | |
585 n = (int) ((double) total_glyphs / width * d); | |
586 } | |
587 else | |
588 n = 0; | |
589 | |
590 return n; | |
591 } | |
592 | |
593 | |
594 /* Adjust glyph matrix MATRIX on window W or on a frame to changed | |
595 window sizes. | |
596 | |
597 W is null if the function is called for a frame glyph matrix. | |
598 Otherwise it is the window MATRIX is a member of. X and Y are the | |
599 indices of the first column and row of MATRIX within the frame | |
600 matrix, if such a matrix exists. They are zero for purely | |
601 window-based redisplay. DIM is the needed size of the matrix. | |
602 | |
603 In window-based redisplay, where no frame matrices exist, glyph | |
604 matrices manage their own glyph storage. Otherwise, they allocate | |
605 storage from a common frame glyph pool which can be found in | |
606 MATRIX->pool. | |
607 | |
608 The reason for this memory management strategy is to avoid complete | |
609 frame redraws if possible. When we allocate from a common pool, a | |
610 change of the location or size of a sub-matrix within the pool | |
611 requires a complete redisplay of the frame because we cannot easily | |
612 make sure that the current matrices of all windows still agree with | |
613 what is displayed on the screen. While this is usually fast, it | |
614 leads to screen flickering. */ | |
615 | |
616 static void | |
617 adjust_glyph_matrix (w, matrix, x, y, dim) | |
618 struct window *w; | |
619 struct glyph_matrix *matrix; | |
620 int x, y; | |
621 struct dim dim; | |
622 { | |
623 int i; | |
624 int new_rows; | |
625 int marginal_areas_changed_p = 0; | |
25546 | 626 int header_line_changed_p = 0; |
627 int header_line_p = 0; | |
25012 | 628 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
|
629 int window_x, window_y, window_width = -1, window_height; |
25012 | 630 |
631 /* See if W had a top line that has disappeared now, or vice versa. */ | |
632 if (w) | |
633 { | |
25546 | 634 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
635 header_line_changed_p = header_line_p != matrix->header_line_p; | |
25012 | 636 } |
25546 | 637 matrix->header_line_p = header_line_p; |
25012 | 638 |
639 /* Do nothing if MATRIX' size, position, vscroll, and marginal areas | |
640 haven't changed. This optimization is important because preserving | |
641 the matrix means preventing redisplay. */ | |
642 if (matrix->pool == NULL) | |
643 { | |
644 window_box (w, -1, &window_x, &window_y, &window_width, &window_height); | |
645 left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_width); | |
646 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_width); | |
647 xassert (left >= 0 && right >= 0); | |
648 marginal_areas_changed_p = (left != matrix->left_margin_glyphs | |
649 || right != matrix->right_margin_glyphs); | |
650 | |
651 if (!marginal_areas_changed_p | |
652 && !fonts_changed_p | |
25546 | 653 && !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
|
654 && matrix->window_left_x == XFASTINT (w->left) |
25012 | 655 && matrix->window_top_y == XFASTINT (w->top) |
656 && matrix->window_height == window_height | |
657 && matrix->window_vscroll == w->vscroll | |
658 && matrix->window_width == window_width) | |
659 return; | |
660 } | |
661 | |
662 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */ | |
663 if (matrix->rows_allocated < dim.height) | |
664 { | |
665 int size = dim.height * sizeof (struct glyph_row); | |
666 new_rows = dim.height - matrix->rows_allocated; | |
667 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size); | |
668 bzero (matrix->rows + matrix->rows_allocated, | |
669 new_rows * sizeof *matrix->rows); | |
670 matrix->rows_allocated = dim.height; | |
671 } | |
672 else | |
673 new_rows = 0; | |
674 | |
675 /* If POOL is not null, MATRIX is a frame matrix or a window matrix | |
676 on a frame not using window-based redisplay. Set up pointers for | |
677 each row into the glyph pool. */ | |
678 if (matrix->pool) | |
679 { | |
680 xassert (matrix->pool->glyphs); | |
681 | |
682 if (w) | |
683 { | |
684 left = margin_glyphs_to_reserve (w, dim.width, | |
685 w->left_margin_width); | |
686 right = margin_glyphs_to_reserve (w, dim.width, | |
687 w->right_margin_width); | |
688 } | |
689 else | |
690 left = right = 0; | |
691 | |
692 for (i = 0; i < dim.height; ++i) | |
693 { | |
694 struct glyph_row *row = &matrix->rows[i]; | |
695 | |
696 row->glyphs[LEFT_MARGIN_AREA] | |
697 = (matrix->pool->glyphs | |
698 + (y + i) * matrix->pool->ncolumns | |
699 + x); | |
700 | |
701 if (w == NULL | |
702 || row == matrix->rows + dim.height - 1 | |
25546 | 703 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 704 { |
705 row->glyphs[TEXT_AREA] | |
706 = row->glyphs[LEFT_MARGIN_AREA]; | |
707 row->glyphs[RIGHT_MARGIN_AREA] | |
708 = row->glyphs[TEXT_AREA] + dim.width; | |
709 row->glyphs[LAST_AREA] | |
710 = row->glyphs[RIGHT_MARGIN_AREA]; | |
711 } | |
712 else | |
713 { | |
714 row->glyphs[TEXT_AREA] | |
715 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
716 row->glyphs[RIGHT_MARGIN_AREA] | |
717 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
718 row->glyphs[LAST_AREA] | |
719 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
720 } | |
721 } | |
722 | |
723 matrix->left_margin_glyphs = left; | |
724 matrix->right_margin_glyphs = right; | |
725 } | |
726 else | |
727 { | |
728 /* If MATRIX->pool is null, MATRIX is responsible for managing | |
729 its own memory. Allocate glyph memory from the heap. */ | |
730 if (dim.width > matrix->matrix_w | |
731 || new_rows | |
25546 | 732 || header_line_changed_p |
25012 | 733 || marginal_areas_changed_p) |
734 { | |
735 struct glyph_row *row = matrix->rows; | |
736 struct glyph_row *end = row + matrix->rows_allocated; | |
737 | |
738 while (row < end) | |
739 { | |
740 row->glyphs[LEFT_MARGIN_AREA] | |
741 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA], | |
742 (dim.width | |
743 * sizeof (struct glyph))); | |
744 | |
745 /* The mode line never has marginal areas. */ | |
746 if (row == matrix->rows + dim.height - 1 | |
25546 | 747 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 748 { |
749 row->glyphs[TEXT_AREA] | |
750 = row->glyphs[LEFT_MARGIN_AREA]; | |
751 row->glyphs[RIGHT_MARGIN_AREA] | |
752 = row->glyphs[TEXT_AREA] + dim.width; | |
753 row->glyphs[LAST_AREA] | |
754 = row->glyphs[RIGHT_MARGIN_AREA]; | |
755 } | |
756 else | |
757 { | |
758 row->glyphs[TEXT_AREA] | |
759 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
760 row->glyphs[RIGHT_MARGIN_AREA] | |
761 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
762 row->glyphs[LAST_AREA] | |
763 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
764 } | |
765 ++row; | |
766 } | |
767 } | |
768 | |
769 xassert (left >= 0 && right >= 0); | |
770 matrix->left_margin_glyphs = left; | |
771 matrix->right_margin_glyphs = right; | |
772 } | |
773 | |
774 /* Number of rows to be used by MATRIX. */ | |
775 matrix->nrows = dim.height; | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
776 xassert (matrix->nrows >= 0); |
25012 | 777 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
778 if (w) |
25012 | 779 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
780 if (matrix == w->current_matrix) |
25012 | 781 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
782 /* Mark rows in a current matrix of a window as not having |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
783 valid contents. It's important to not do this for |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
784 desired matrices. When Emacs starts, it may already be |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
785 building desired matrices when this function runs. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
786 if (window_width < 0) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
787 window_width = window_box_width (w, -1); |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
788 |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
789 /* Optimize the case that only the height has changed (C-x 2, |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
790 upper window). Invalidate all rows that are no longer part |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
791 of the window. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
792 if (!marginal_areas_changed_p |
37098
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
793 && !header_line_changed_p |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
794 && new_rows == 0 |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
795 && dim.width == matrix->matrix_w |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
796 && matrix->window_left_x == XFASTINT (w->left) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
797 && matrix->window_top_y == XFASTINT (w->top) |
37098
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
798 && matrix->window_width == window_width) |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
799 { |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
800 i = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
801 while (matrix->rows[i].enabled_p |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
802 && (MATRIX_ROW_BOTTOM_Y (matrix->rows + i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
803 < matrix->window_height)) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
804 ++i; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
805 |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
806 /* Window end is invalid, if inside of the rows that |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
807 are invalidated. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
808 if (INTEGERP (w->window_end_vpos) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
809 && XFASTINT (w->window_end_vpos) >= i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
810 w->window_end_valid = Qnil; |
25012 | 811 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
812 while (i < matrix->nrows) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
813 matrix->rows[i++].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
814 } |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
815 else |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
816 { |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
817 for (i = 0; i < matrix->nrows; ++i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
818 matrix->rows[i].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
819 } |
25012 | 820 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
821 else if (matrix == w->desired_matrix) |
25012 | 822 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
823 /* Rows in desired matrices always have to be cleared; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
824 redisplay expects this is the case when it runs, so it |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
825 had better be the case when we adjust matrices between |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
826 redisplays. */ |
25012 | 827 for (i = 0; i < matrix->nrows; ++i) |
828 matrix->rows[i].enabled_p = 0; | |
829 } | |
830 } | |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
831 |
25012 | 832 |
833 /* Remember last values to be able to optimize frame redraws. */ | |
834 matrix->matrix_x = x; | |
835 matrix->matrix_y = y; | |
836 matrix->matrix_w = dim.width; | |
837 matrix->matrix_h = dim.height; | |
838 | |
839 /* Record the top y location and height of W at the time the matrix | |
840 was last adjusted. This is used to optimize redisplay above. */ | |
841 if (w) | |
842 { | |
34279
7ab25b4a077c
(adjust_glyph_matrix): Don't reuse a window's current
Gerd Moellmann <gerd@gnu.org>
parents:
34203
diff
changeset
|
843 matrix->window_left_x = XFASTINT (w->left); |
25012 | 844 matrix->window_top_y = XFASTINT (w->top); |
845 matrix->window_height = window_height; | |
846 matrix->window_width = window_width; | |
847 matrix->window_vscroll = w->vscroll; | |
848 } | |
849 } | |
850 | |
851 | |
852 /* Reverse the contents of rows in MATRIX between START and END. The | |
853 contents of the row at END - 1 end up at START, END - 2 at START + | |
854 1 etc. This is part of the implementation of rotate_matrix (see | |
855 below). */ | |
314 | 856 |
857 static void | |
25012 | 858 reverse_rows (matrix, start, end) |
859 struct glyph_matrix *matrix; | |
860 int start, end; | |
314 | 861 { |
25012 | 862 int i, j; |
863 | |
864 for (i = start, j = end - 1; i < j; ++i, --j) | |
865 { | |
866 /* Non-ISO HP/UX compiler doesn't like auto struct | |
867 initialization. */ | |
868 struct glyph_row temp; | |
869 temp = matrix->rows[i]; | |
870 matrix->rows[i] = matrix->rows[j]; | |
871 matrix->rows[j] = temp; | |
872 } | |
314 | 873 } |
874 | |
25012 | 875 |
876 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST - | |
877 1 by BY positions. BY < 0 means rotate left, i.e. towards lower | |
878 indices. (Note: this does not copy glyphs, only glyph pointers in | |
879 row structures are moved around). | |
880 | |
881 The algorithm used for rotating the vector was, I believe, first | |
882 described by Kernighan. See the vector R as consisting of two | |
883 sub-vectors AB, where A has length BY for BY >= 0. The result | |
884 after rotating is then BA. Reverse both sub-vectors to get ArBr | |
885 and reverse the result to get (ArBr)r which is BA. Similar for | |
886 rotating right. */ | |
887 | |
888 void | |
889 rotate_matrix (matrix, first, last, by) | |
890 struct glyph_matrix *matrix; | |
891 int first, last, by; | |
314 | 892 { |
25012 | 893 if (by < 0) |
894 { | |
895 /* Up (rotate left, i.e. towards lower indices). */ | |
896 by = -by; | |
897 reverse_rows (matrix, first, first + by); | |
898 reverse_rows (matrix, first + by, last); | |
899 reverse_rows (matrix, first, last); | |
900 } | |
901 else if (by > 0) | |
314 | 902 { |
25012 | 903 /* Down (rotate right, i.e. towards higher indices). */ |
904 reverse_rows (matrix, last - by, last); | |
905 reverse_rows (matrix, first, last - by); | |
906 reverse_rows (matrix, first, last); | |
314 | 907 } |
25012 | 908 } |
909 | |
910 | |
911 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows | |
912 with indices START <= index < END. Increment positions by DELTA/ | |
913 DELTA_BYTES. */ | |
914 | |
915 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
916 increment_matrix_positions (matrix, start, end, delta, delta_bytes) |
25012 | 917 struct glyph_matrix *matrix; |
918 int start, end, delta, delta_bytes; | |
919 { | |
920 /* Check that START and END are reasonable values. */ | |
921 xassert (start >= 0 && start <= matrix->nrows); | |
922 xassert (end >= 0 && end <= matrix->nrows); | |
923 xassert (start <= end); | |
924 | |
925 for (; start < end; ++start) | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
926 increment_row_positions (matrix->rows + start, delta, delta_bytes); |
25012 | 927 } |
928 | |
929 | |
930 /* Enable a range of rows in glyph matrix MATRIX. START and END are | |
931 the row indices of the first and last + 1 row to enable. If | |
932 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */ | |
933 | |
934 void | |
935 enable_glyph_matrix_rows (matrix, start, end, enabled_p) | |
936 struct glyph_matrix *matrix; | |
937 int start, end; | |
938 int enabled_p; | |
939 { | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
940 xassert (start <= end); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
941 xassert (start >= 0 && start < matrix->nrows); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
942 xassert (end >= 0 && end <= matrix->nrows); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
943 |
25012 | 944 for (; start < end; ++start) |
945 matrix->rows[start].enabled_p = enabled_p != 0; | |
946 } | |
947 | |
948 | |
949 /* Clear MATRIX. | |
950 | |
951 This empties all rows in MATRIX by setting the enabled_p flag for | |
952 all rows of the matrix to zero. The function prepare_desired_row | |
953 will eventually really clear a row when it sees one with a zero | |
954 enabled_p flag. | |
955 | |
956 Resets update hints to defaults value. The only update hint | |
957 currently present is the flag MATRIX->no_scrolling_p. */ | |
958 | |
959 void | |
960 clear_glyph_matrix (matrix) | |
961 struct glyph_matrix *matrix; | |
962 { | |
963 if (matrix) | |
314 | 964 { |
25012 | 965 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0); |
966 matrix->no_scrolling_p = 0; | |
314 | 967 } |
968 } | |
25012 | 969 |
970 | |
971 /* Shift part of the glyph matrix MATRIX of window W up or down. | |
972 Increment y-positions in glyph rows between START and END by DY, | |
973 and recompute their visible height. */ | |
974 | |
975 void | |
976 shift_glyph_matrix (w, matrix, start, end, dy) | |
977 struct window *w; | |
978 struct glyph_matrix *matrix; | |
979 int start, end, dy; | |
980 { | |
981 int min_y, max_y; | |
982 | |
983 xassert (start <= end); | |
984 xassert (start >= 0 && start < matrix->nrows); | |
985 xassert (end >= 0 && end <= matrix->nrows); | |
986 | |
25546 | 987 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 988 max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w); |
989 | |
990 for (; start < end; ++start) | |
991 { | |
992 struct glyph_row *row = &matrix->rows[start]; | |
993 | |
994 row->y += dy; | |
995 | |
996 if (row->y < min_y) | |
997 row->visible_height = row->height - (min_y - row->y); | |
998 else if (row->y + row->height > max_y) | |
999 row->visible_height = row->height - (row->y + row->height - max_y); | |
1000 else | |
1001 row->visible_height = row->height; | |
1002 } | |
1003 } | |
1004 | |
1005 | |
1006 /* Mark all rows in current matrices of frame F as invalid. Marking | |
1007 invalid is done by setting enabled_p to zero for all rows in a | |
1008 current matrix. */ | |
1009 | |
1010 void | |
1011 clear_current_matrices (f) | |
1012 register struct frame *f; | |
1013 { | |
1014 /* Clear frame current matrix, if we have one. */ | |
1015 if (f->current_matrix) | |
1016 clear_glyph_matrix (f->current_matrix); | |
1017 | |
1018 /* Clear the matrix of the menu bar window, if such a window exists. | |
1019 The menu bar window is currently used to display menus on X when | |
1020 no toolkit support is compiled in. */ | |
1021 if (WINDOWP (f->menu_bar_window)) | |
1022 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix); | |
1023 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1024 /* 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
|
1025 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
|
1026 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |
25012 | 1027 |
1028 /* Clear current window matrices. */ | |
1029 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1030 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0); | |
1031 } | |
1032 | |
1033 | |
1034 /* Clear out all display lines of F for a coming redisplay. */ | |
314 | 1035 |
21514 | 1036 void |
25012 | 1037 clear_desired_matrices (f) |
1038 register struct frame *f; | |
314 | 1039 { |
25012 | 1040 if (f->desired_matrix) |
1041 clear_glyph_matrix (f->desired_matrix); | |
1042 | |
1043 if (WINDOWP (f->menu_bar_window)) | |
1044 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix); | |
1045 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1046 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
|
1047 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix); |
25012 | 1048 |
1049 /* Do it for window matrices. */ | |
1050 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1051 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
1052 } | |
1053 | |
1054 | |
1055 /* Clear matrices in window tree rooted in W. If DESIRED_P is | |
1056 non-zero clear desired matrices, otherwise clear current matrices. */ | |
1057 | |
1058 static void | |
1059 clear_window_matrices (w, desired_p) | |
1060 struct window *w; | |
1061 int desired_p; | |
1062 { | |
1063 while (w) | |
314 | 1064 { |
25012 | 1065 if (!NILP (w->hchild)) |
1066 { | |
1067 xassert (WINDOWP (w->hchild)); | |
1068 clear_window_matrices (XWINDOW (w->hchild), desired_p); | |
1069 } | |
1070 else if (!NILP (w->vchild)) | |
314 | 1071 { |
25012 | 1072 xassert (WINDOWP (w->vchild)); |
1073 clear_window_matrices (XWINDOW (w->vchild), desired_p); | |
1074 } | |
1075 else | |
1076 { | |
1077 if (desired_p) | |
1078 clear_glyph_matrix (w->desired_matrix); | |
1079 else | |
314 | 1080 { |
25012 | 1081 clear_glyph_matrix (w->current_matrix); |
1082 w->window_end_valid = Qnil; | |
314 | 1083 } |
25012 | 1084 } |
1085 | |
1086 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
1087 } | |
1088 } | |
1089 | |
1090 | |
1091 | |
1092 /*********************************************************************** | |
1093 Glyph Rows | |
1094 | |
1095 See dispextern.h for an overall explanation of glyph rows. | |
1096 ***********************************************************************/ | |
1097 | |
1098 /* Clear glyph row ROW. Do it in a way that makes it robust against | |
1099 changes in the glyph_row structure, i.e. addition or removal of | |
1100 structure members. */ | |
1101 | |
33527
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1102 static struct glyph_row null_row; |
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1103 |
25012 | 1104 void |
1105 clear_glyph_row (row) | |
1106 struct glyph_row *row; | |
1107 { | |
1108 struct glyph *p[1 + LAST_AREA]; | |
1109 | |
1110 /* Save pointers. */ | |
1111 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA]; | |
1112 p[TEXT_AREA] = row->glyphs[TEXT_AREA]; | |
1113 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA]; | |
1114 p[LAST_AREA] = row->glyphs[LAST_AREA]; | |
1115 | |
1116 /* Clear. */ | |
1117 *row = null_row; | |
1118 | |
1119 /* Restore pointers. */ | |
1120 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA]; | |
1121 row->glyphs[TEXT_AREA] = p[TEXT_AREA]; | |
1122 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA]; | |
1123 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
|
1124 |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1125 #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
|
1126 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
|
1127 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
|
1128 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
|
1129 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
|
1130 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
|
1131 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
|
1132 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
|
1133 #endif |
25012 | 1134 } |
1135 | |
1136 | |
1137 /* Make ROW an empty, enabled row of canonical character height, | |
1138 in window W starting at y-position Y. */ | |
1139 | |
1140 void | |
1141 blank_row (w, row, y) | |
1142 struct window *w; | |
1143 struct glyph_row *row; | |
1144 int y; | |
1145 { | |
1146 int min_y, max_y; | |
1147 | |
25546 | 1148 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
25012 | 1149 max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w); |
1150 | |
1151 clear_glyph_row (row); | |
1152 row->y = y; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1153 row->ascent = row->phys_ascent = 0; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1154 row->height = row->phys_height = CANON_Y_UNIT (XFRAME (w->frame)); |
25012 | 1155 |
1156 if (row->y < min_y) | |
1157 row->visible_height = row->height - (min_y - row->y); | |
1158 else if (row->y + row->height > max_y) | |
1159 row->visible_height = row->height - (row->y + row->height - max_y); | |
1160 else | |
1161 row->visible_height = row->height; | |
1162 | |
1163 row->enabled_p = 1; | |
1164 } | |
1165 | |
1166 | |
1167 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES | |
1168 are the amounts by which to change positions. Note that the first | |
1169 glyph of the text area of a row can have a buffer position even if | |
1170 the used count of the text area is zero. Such rows display line | |
1171 ends. */ | |
1172 | |
1173 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1174 increment_row_positions (row, delta, delta_bytes) |
25012 | 1175 struct glyph_row *row; |
1176 int delta, delta_bytes; | |
1177 { | |
1178 int area, i; | |
1179 | |
1180 /* Increment start and end positions. */ | |
1181 MATRIX_ROW_START_CHARPOS (row) += delta; | |
1182 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes; | |
1183 MATRIX_ROW_END_CHARPOS (row) += delta; | |
1184 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes; | |
1185 | |
1186 /* Increment positions in glyphs. */ | |
1187 for (area = 0; area < LAST_AREA; ++area) | |
1188 for (i = 0; i < row->used[area]; ++i) | |
1189 if (BUFFERP (row->glyphs[area][i].object) | |
1190 && row->glyphs[area][i].charpos > 0) | |
1191 row->glyphs[area][i].charpos += delta; | |
1192 | |
1193 /* Capture the case of rows displaying a line end. */ | |
1194 if (row->used[TEXT_AREA] == 0 | |
1195 && MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1196 row->glyphs[TEXT_AREA]->charpos += delta; | |
1197 } | |
1198 | |
1199 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1200 #if 0 |
25012 | 1201 /* Swap glyphs between two glyph rows A and B. This exchanges glyph |
1202 contents, i.e. glyph structure contents are exchanged between A and | |
1203 B without changing glyph pointers in A and B. */ | |
1204 | |
1205 static void | |
1206 swap_glyphs_in_rows (a, b) | |
1207 struct glyph_row *a, *b; | |
1208 { | |
1209 int area; | |
1210 | |
1211 for (area = 0; area < LAST_AREA; ++area) | |
1212 { | |
1213 /* Number of glyphs to swap. */ | |
1214 int max_used = max (a->used[area], b->used[area]); | |
1215 | |
1216 /* Start of glyphs in area of row A. */ | |
1217 struct glyph *glyph_a = a->glyphs[area]; | |
1218 | |
1219 /* End + 1 of glyphs in area of row A. */ | |
1220 struct glyph *glyph_a_end = a->glyphs[max_used]; | |
1221 | |
1222 /* Start of glyphs in area of row B. */ | |
1223 struct glyph *glyph_b = b->glyphs[area]; | |
1224 | |
1225 while (glyph_a < glyph_a_end) | |
1226 { | |
1227 /* Non-ISO HP/UX compiler doesn't like auto struct | |
1228 initialization. */ | |
1229 struct glyph temp; | |
1230 temp = *glyph_a; | |
1231 *glyph_a = *glyph_b; | |
1232 *glyph_b = temp; | |
1233 ++glyph_a; | |
1234 ++glyph_b; | |
314 | 1235 } |
1236 } | |
1237 } | |
25012 | 1238 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1239 #endif /* 0 */ |
25012 | 1240 |
1241 /* Exchange pointers to glyph memory between glyph rows A and B. */ | |
1242 | |
1243 static INLINE void | |
1244 swap_glyph_pointers (a, b) | |
1245 struct glyph_row *a, *b; | |
1246 { | |
1247 int i; | |
1248 for (i = 0; i < LAST_AREA + 1; ++i) | |
1249 { | |
1250 struct glyph *temp = a->glyphs[i]; | |
1251 a->glyphs[i] = b->glyphs[i]; | |
1252 b->glyphs[i] = temp; | |
1253 } | |
1254 } | |
1255 | |
1256 | |
1257 /* Copy glyph row structure FROM to glyph row structure TO, except | |
1258 that glyph pointers in the structures are left unchanged. */ | |
1259 | |
1260 INLINE void | |
1261 copy_row_except_pointers (to, from) | |
1262 struct glyph_row *to, *from; | |
1263 { | |
1264 struct glyph *pointers[1 + LAST_AREA]; | |
1265 | |
1266 /* Save glyph pointers of TO. */ | |
1267 bcopy (to->glyphs, pointers, sizeof to->glyphs); | |
1268 | |
1269 /* Do a structure assignment. */ | |
1270 *to = *from; | |
1271 | |
1272 /* Restore original pointers of TO. */ | |
1273 bcopy (pointers, to->glyphs, sizeof to->glyphs); | |
1274 } | |
1275 | |
1276 | |
1277 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in | |
1278 TO and FROM are left unchanged. Glyph contents are copied from the | |
1279 glyph memory of FROM to the glyph memory of TO. Increment buffer | |
1280 positions in row TO by DELTA/ DELTA_BYTES. */ | |
1281 | |
1282 void | |
1283 copy_glyph_row_contents (to, from, delta, delta_bytes) | |
1284 struct glyph_row *to, *from; | |
1285 int delta, delta_bytes; | |
1286 { | |
1287 int area; | |
1288 | |
1289 /* This is like a structure assignment TO = FROM, except that | |
1290 glyph pointers in the rows are left unchanged. */ | |
1291 copy_row_except_pointers (to, from); | |
1292 | |
1293 /* Copy glyphs from FROM to TO. */ | |
1294 for (area = 0; area < LAST_AREA; ++area) | |
1295 if (from->used[area]) | |
1296 bcopy (from->glyphs[area], to->glyphs[area], | |
1297 from->used[area] * sizeof (struct glyph)); | |
1298 | |
1299 /* Increment buffer positions in TO by DELTA. */ | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1300 increment_row_positions (to, delta, delta_bytes); |
25012 | 1301 } |
1302 | |
1303 | |
1304 /* Assign glyph row FROM to glyph row TO. This works like a structure | |
1305 assignment TO = FROM, except that glyph pointers are not copied but | |
1306 exchanged between TO and FROM. Pointers must be exchanged to avoid | |
1307 a memory leak. */ | |
1308 | |
1309 static INLINE void | |
1310 assign_row (to, from) | |
1311 struct glyph_row *to, *from; | |
1312 { | |
1313 swap_glyph_pointers (to, from); | |
1314 copy_row_except_pointers (to, from); | |
1315 } | |
1316 | |
1317 | |
1318 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is | |
1319 a row in a window matrix, is a slice of the glyph memory of the | |
1320 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value | |
1321 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph | |
1322 memory of FRAME_ROW. */ | |
1323 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
1324 #if GLYPH_DEBUG |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1325 |
25012 | 1326 static int |
1327 glyph_row_slice_p (window_row, frame_row) | |
1328 struct glyph_row *window_row, *frame_row; | |
1329 { | |
1330 struct glyph *window_glyph_start = window_row->glyphs[0]; | |
1331 struct glyph *frame_glyph_start = frame_row->glyphs[0]; | |
1332 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA]; | |
1333 | |
1334 return (frame_glyph_start <= window_glyph_start | |
1335 && window_glyph_start < frame_glyph_end); | |
1336 } | |
1337 | |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1338 #endif /* GLYPH_DEBUG */ |
25012 | 1339 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1340 #if 0 |
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1341 |
25012 | 1342 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice |
1343 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row | |
1344 in WINDOW_MATRIX is found satisfying the condition. */ | |
1345 | |
1346 static struct glyph_row * | |
1347 find_glyph_row_slice (window_matrix, frame_matrix, row) | |
1348 struct glyph_matrix *window_matrix, *frame_matrix; | |
1349 int row; | |
1350 { | |
1351 int i; | |
1352 | |
1353 xassert (row >= 0 && row < frame_matrix->nrows); | |
1354 | |
1355 for (i = 0; i < window_matrix->nrows; ++i) | |
1356 if (glyph_row_slice_p (window_matrix->rows + i, | |
1357 frame_matrix->rows + row)) | |
1358 break; | |
1359 | |
1360 return i < window_matrix->nrows ? window_matrix->rows + i : 0; | |
1361 } | |
1362 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1363 #endif /* 0 */ |
25012 | 1364 |
1365 /* Prepare ROW for display. Desired rows are cleared lazily, | |
1366 i.e. they are only marked as to be cleared by setting their | |
1367 enabled_p flag to zero. When a row is to be displayed, a prior | |
1368 call to this function really clears it. */ | |
1369 | |
1370 void | |
1371 prepare_desired_row (row) | |
1372 struct glyph_row *row; | |
1373 { | |
1374 if (!row->enabled_p) | |
1375 { | |
1376 clear_glyph_row (row); | |
1377 row->enabled_p = 1; | |
1378 } | |
1379 } | |
1380 | |
1381 | |
1382 /* Return a hash code for glyph row ROW. */ | |
1383 | |
1384 int | |
1385 line_hash_code (row) | |
1386 struct glyph_row *row; | |
1387 { | |
1388 int hash = 0; | |
1389 | |
1390 if (row->enabled_p) | |
1391 { | |
1392 if (row->inverse_p) | |
1393 { | |
1394 /* Give all highlighted lines the same hash code | |
1395 so as to encourage scrolling to leave them in place. */ | |
1396 hash = -1; | |
1397 } | |
1398 else | |
1399 { | |
1400 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
1401 struct glyph *end = glyph + row->used[TEXT_AREA]; | |
1402 | |
1403 while (glyph < end) | |
1404 { | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1405 int c = glyph->u.ch; |
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1406 int face_id = glyph->face_id; |
25012 | 1407 if (must_write_spaces) |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1408 c -= SPACEGLYPH; |
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1409 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
|
1410 hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + face_id; |
25012 | 1411 ++glyph; |
1412 } | |
1413 | |
1414 if (hash == 0) | |
1415 hash = 1; | |
1416 } | |
1417 } | |
1418 | |
1419 return hash; | |
1420 } | |
1421 | |
1422 | |
1423 /* Return the cost of drawing line VPOS In MATRIX. The cost equals | |
1424 the number of characters in the line. If must_write_spaces is | |
1425 zero, leading and trailing spaces are ignored. */ | |
1426 | |
1427 static unsigned int | |
1428 line_draw_cost (matrix, vpos) | |
1429 struct glyph_matrix *matrix; | |
1430 int vpos; | |
1431 { | |
1432 struct glyph_row *row = matrix->rows + vpos; | |
1433 struct glyph *beg = row->glyphs[TEXT_AREA]; | |
1434 struct glyph *end = beg + row->used[TEXT_AREA]; | |
1435 int len; | |
1436 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE; | |
1437 int glyph_table_len = GLYPH_TABLE_LENGTH; | |
1438 | |
1439 /* Ignore trailing and leading spaces if we can. */ | |
1440 if (!must_write_spaces) | |
1441 { | |
1442 /* 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
|
1443 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1))) |
25012 | 1444 --end; |
1445 | |
1446 /* All blank line. */ | |
1447 if (end == beg) | |
1448 return 0; | |
1449 | |
1450 /* Skip over leading spaces. */ | |
1451 while (CHAR_GLYPH_SPACE_P (*beg)) | |
1452 ++beg; | |
1453 } | |
1454 | |
1455 /* If we don't have a glyph-table, each glyph is one character, | |
1456 so return the number of glyphs. */ | |
1457 if (glyph_table_base == 0) | |
1458 len = end - beg; | |
1459 else | |
1460 { | |
1461 /* Otherwise, scan the glyphs and accumulate their total length | |
1462 in LEN. */ | |
1463 len = 0; | |
1464 while (beg < end) | |
1465 { | |
1466 GLYPH g = GLYPH_FROM_CHAR_GLYPH (*beg); | |
1467 | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1468 if (g < 0 |
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1469 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g)) |
25012 | 1470 len += 1; |
1471 else | |
1472 len += GLYPH_LENGTH (glyph_table_base, g); | |
1473 | |
1474 ++beg; | |
1475 } | |
1476 } | |
1477 | |
1478 return len; | |
1479 } | |
1480 | |
1481 | |
1482 /* Test two glyph rows A and B for equality. Value is non-zero if A | |
1483 and B have equal contents. W is the window to which the glyphs | |
1484 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
|
1485 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
|
1486 flags of A and B, too. */ |
25012 | 1487 |
1488 static INLINE int | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1489 row_equal_p (w, a, b, mouse_face_p) |
25012 | 1490 struct window *w; |
1491 struct glyph_row *a, *b; | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1492 int mouse_face_p; |
25012 | 1493 { |
1494 if (a == b) | |
1495 return 1; | |
1496 else if (a->hash != b->hash) | |
1497 return 0; | |
1498 else | |
1499 { | |
1500 struct glyph *a_glyph, *b_glyph, *a_end; | |
1501 int area; | |
1502 | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1503 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
|
1504 return 0; |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1505 |
25012 | 1506 /* Compare glyphs. */ |
1507 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
1508 { | |
1509 if (a->used[area] != b->used[area]) | |
1510 return 0; | |
1511 | |
1512 a_glyph = a->glyphs[area]; | |
1513 a_end = a_glyph + a->used[area]; | |
1514 b_glyph = b->glyphs[area]; | |
1515 | |
1516 while (a_glyph < a_end | |
1517 && GLYPH_EQUAL_P (a_glyph, b_glyph)) | |
1518 ++a_glyph, ++b_glyph; | |
1519 | |
1520 if (a_glyph != a_end) | |
1521 return 0; | |
1522 } | |
1523 | |
1524 if (a->truncated_on_left_p != b->truncated_on_left_p | |
1525 || a->inverse_p != b->inverse_p | |
1526 || a->fill_line_p != b->fill_line_p | |
1527 || a->truncated_on_right_p != b->truncated_on_right_p | |
1528 || a->overlay_arrow_p != b->overlay_arrow_p | |
1529 || a->continued_p != b->continued_p | |
1530 || 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
|
1531 || a->overlapped_p != b->overlapped_p |
25012 | 1532 || (MATRIX_ROW_CONTINUATION_LINE_P (a) |
1533 != MATRIX_ROW_CONTINUATION_LINE_P (b)) | |
1534 /* Different partially visible characters on left margin. */ | |
1535 || a->x != b->x | |
1536 /* Different height. */ | |
1537 || a->ascent != b->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1538 || a->phys_ascent != b->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1539 || a->phys_height != b->phys_height |
25012 | 1540 || a->visible_height != b->visible_height) |
1541 return 0; | |
1542 } | |
1543 | |
1544 return 1; | |
1545 } | |
1546 | |
1547 | |
314 | 1548 |
25012 | 1549 /*********************************************************************** |
1550 Glyph Pool | |
1551 | |
1552 See dispextern.h for an overall explanation of glyph pools. | |
1553 ***********************************************************************/ | |
1554 | |
1555 /* Allocate a glyph_pool structure. The structure returned is | |
1556 initialized with zeros. The global variable glyph_pool_count is | |
1557 incremented for each pool allocated. */ | |
1558 | |
1559 static struct glyph_pool * | |
1560 new_glyph_pool () | |
1561 { | |
1562 struct glyph_pool *result; | |
1563 | |
1564 /* Allocate a new glyph_pool and clear it. */ | |
1565 result = (struct glyph_pool *) xmalloc (sizeof *result); | |
1566 bzero (result, sizeof *result); | |
1567 | |
1568 /* For memory leak and double deletion checking. */ | |
1569 ++glyph_pool_count; | |
1570 | |
1571 return result; | |
1572 } | |
1573 | |
1574 | |
1575 /* Free a glyph_pool structure POOL. The function may be called with | |
1576 a null POOL pointer. The global variable glyph_pool_count is | |
1577 decremented with every pool structure freed. If this count gets | |
1578 negative, more structures were freed than allocated, i.e. one | |
1579 structure must have been freed more than once or a bogus pointer | |
1580 was passed to free_glyph_pool. */ | |
1581 | |
1582 static void | |
1583 free_glyph_pool (pool) | |
1584 struct glyph_pool *pool; | |
1585 { | |
1586 if (pool) | |
1587 { | |
1588 /* More freed than allocated? */ | |
1589 --glyph_pool_count; | |
1590 xassert (glyph_pool_count >= 0); | |
1591 | |
1592 xfree (pool->glyphs); | |
1593 xfree (pool); | |
1594 } | |
1595 } | |
1596 | |
1597 | |
1598 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and | |
1599 columns we need. This function never shrinks a pool. The only | |
1600 case in which this would make sense, would be when a frame's size | |
1601 is changed from a large value to a smaller one. But, if someone | |
1602 does it once, we can expect that he will do it again. | |
1603 | |
1604 Value is non-zero if the pool changed in a way which makes | |
1605 re-adjusting window glyph matrices necessary. */ | |
1606 | |
1607 static int | |
1608 realloc_glyph_pool (pool, matrix_dim) | |
1609 struct glyph_pool *pool; | |
1610 struct dim matrix_dim; | |
1611 { | |
1612 int needed; | |
1613 int changed_p; | |
1614 | |
1615 changed_p = (pool->glyphs == 0 | |
1616 || matrix_dim.height != pool->nrows | |
1617 || matrix_dim.width != pool->ncolumns); | |
1618 | |
1619 /* Enlarge the glyph pool. */ | |
1620 needed = matrix_dim.width * matrix_dim.height; | |
1621 if (needed > pool->nglyphs) | |
1622 { | |
1623 int size = needed * sizeof (struct glyph); | |
1624 | |
1625 if (pool->glyphs) | |
1626 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size); | |
1627 else | |
1628 { | |
1629 pool->glyphs = (struct glyph *) xmalloc (size); | |
1630 bzero (pool->glyphs, size); | |
1631 } | |
1632 | |
1633 pool->nglyphs = needed; | |
1634 } | |
1635 | |
1636 /* Remember the number of rows and columns because (a) we use then | |
1637 to do sanity checks, and (b) the number of columns determines | |
1638 where rows in the frame matrix start---this must be available to | |
1639 determine pointers to rows of window sub-matrices. */ | |
1640 pool->nrows = matrix_dim.height; | |
1641 pool->ncolumns = matrix_dim.width; | |
1642 | |
1643 return changed_p; | |
1644 } | |
1645 | |
1646 | |
1647 | |
1648 /*********************************************************************** | |
1649 Debug Code | |
1650 ***********************************************************************/ | |
1651 | |
1652 #if GLYPH_DEBUG | |
1653 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1654 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1655 /* 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
|
1656 the debugger. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1657 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1658 void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1659 flush_stdout () |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1660 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1661 fflush (stdout); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1662 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1663 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1664 |
25012 | 1665 /* Check that no glyph pointers have been lost in MATRIX. If a |
1666 pointer has been lost, e.g. by using a structure assignment between | |
1667 rows, at least one pointer must occur more than once in the rows of | |
1668 MATRIX. */ | |
1669 | |
1670 void | |
1671 check_matrix_pointer_lossage (matrix) | |
1672 struct glyph_matrix *matrix; | |
1673 { | |
1674 int i, j; | |
1675 | |
1676 for (i = 0; i < matrix->nrows; ++i) | |
1677 for (j = 0; j < matrix->nrows; ++j) | |
1678 xassert (i == j | |
1679 || (matrix->rows[i].glyphs[TEXT_AREA] | |
1680 != matrix->rows[j].glyphs[TEXT_AREA])); | |
1681 } | |
1682 | |
1683 | |
1684 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */ | |
1685 | |
1686 struct glyph_row * | |
1687 matrix_row (matrix, row) | |
1688 struct glyph_matrix *matrix; | |
1689 int row; | |
1690 { | |
1691 xassert (matrix && matrix->rows); | |
1692 xassert (row >= 0 && row < matrix->nrows); | |
1693 | |
1694 /* That's really too slow for normal testing because this function | |
1695 is called almost everywhere. Although---it's still astonishingly | |
1696 fast, so it is valuable to have for debugging purposes. */ | |
314 | 1697 #if 0 |
25012 | 1698 check_matrix_pointer_lossage (matrix); |
1699 #endif | |
1700 | |
1701 return matrix->rows + row; | |
1702 } | |
1703 | |
1704 | |
1705 #if 0 /* This function makes invalid assumptions when text is | |
1706 partially invisible. But it might come handy for debugging | |
1707 nevertheless. */ | |
1708 | |
1709 /* Check invariants that must hold for an up to date current matrix of | |
1710 window W. */ | |
1711 | |
1712 static void | |
1713 check_matrix_invariants (w) | |
314 | 1714 struct window *w; |
1715 { | |
25012 | 1716 struct glyph_matrix *matrix = w->current_matrix; |
1717 int yb = window_text_bottom_y (w); | |
1718 struct glyph_row *row = matrix->rows; | |
1719 struct glyph_row *last_text_row = NULL; | |
1720 struct buffer *saved = current_buffer; | |
1721 struct buffer *buffer = XBUFFER (w->buffer); | |
1722 int c; | |
1723 | |
1724 /* This can sometimes happen for a fresh window. */ | |
1725 if (matrix->nrows < 2) | |
1726 return; | |
1727 | |
1728 set_buffer_temp (buffer); | |
1729 | |
1730 /* Note: last row is always reserved for the mode line. */ | |
1731 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1732 && MATRIX_ROW_BOTTOM_Y (row) < yb) | |
1733 { | |
1734 struct glyph_row *next = row + 1; | |
1735 | |
1736 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1737 last_text_row = row; | |
1738 | |
1739 /* Check that character and byte positions are in sync. */ | |
1740 xassert (MATRIX_ROW_START_BYTEPOS (row) | |
1741 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row))); | |
1742 | |
1743 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can | |
1744 have such a position temporarily in case of a minibuffer | |
1745 displaying something like `[Sole completion]' at its end. */ | |
1746 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer)) | |
1747 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1748 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row))); | |
1749 | |
1750 /* Check that end position of `row' is equal to start position | |
1751 of next row. */ | |
1752 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next)) | |
1753 { | |
1754 xassert (MATRIX_ROW_END_CHARPOS (row) | |
1755 == MATRIX_ROW_START_CHARPOS (next)); | |
1756 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1757 == MATRIX_ROW_START_BYTEPOS (next)); | |
1758 } | |
1759 row = next; | |
1760 } | |
1761 | |
1762 xassert (w->current_matrix->nrows == w->desired_matrix->nrows); | |
1763 xassert (w->desired_matrix->rows != NULL); | |
1764 set_buffer_temp (saved); | |
1765 } | |
1766 | |
1767 #endif /* 0 */ | |
1768 | |
1769 #endif /* GLYPH_DEBUG != 0 */ | |
1770 | |
1771 | |
1772 | |
1773 /********************************************************************** | |
1774 Allocating/ Adjusting Glyph Matrices | |
1775 **********************************************************************/ | |
1776 | |
1777 /* Allocate glyph matrices over a window tree for a frame-based | |
1778 redisplay | |
1779 | |
1780 X and Y are column/row within the frame glyph matrix where | |
1781 sub-matrices for the window tree rooted at WINDOW must be | |
1782 allocated. CH_DIM contains the dimensions of the smallest | |
1783 character that could be used during display. DIM_ONLY_P non-zero | |
1784 means that the caller of this function is only interested in the | |
1785 result matrix dimension, and matrix adjustments should not be | |
1786 performed. | |
1787 | |
1788 The function returns the total width/height of the sub-matrices of | |
1789 the window tree. If called on a frame root window, the computation | |
1790 will take the mini-buffer window into account. | |
1791 | |
1792 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits | |
1793 | |
1794 NEW_LEAF_MATRIX set if any window in the tree did not have a | |
1795 glyph matrices yet, and | |
1796 | |
1797 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of | |
1798 any window in the tree will be changed or have been changed (see | |
1799 DIM_ONLY_P). | |
1800 | |
1801 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this | |
1802 function. | |
1803 | |
1804 Windows are arranged into chains of windows on the same level | |
1805 through the next fields of window structures. Such a level can be | |
1806 either a sequence of horizontally adjacent windows from left to | |
1807 right, or a sequence of vertically adjacent windows from top to | |
1808 bottom. Each window in a horizontal sequence can be either a leaf | |
1809 window or a vertical sequence; a window in a vertical sequence can | |
1810 be either a leaf or a horizontal sequence. All windows in a | |
1811 horizontal sequence have the same height, and all windows in a | |
1812 vertical sequence have the same width. | |
1813 | |
1814 This function uses, for historical reasons, a more general | |
1815 algorithm to determine glyph matrix dimensions that would be | |
1816 necessary. | |
1817 | |
1818 The matrix height of a horizontal sequence is determined by the | |
1819 maximum height of any matrix in the sequence. The matrix width of | |
1820 a horizontal sequence is computed by adding up matrix widths of | |
1821 windows in the sequence. | |
1822 | |
1823 |<------- result width ------->| | |
1824 +---------+----------+---------+ --- | |
1825 | | | | | | |
1826 | | | | | |
1827 +---------+ | | result height | |
1828 | +---------+ | |
1829 | | | | |
1830 +----------+ --- | |
1831 | |
1832 The matrix width of a vertical sequence is the maximum matrix width | |
1833 of any window in the sequence. Its height is computed by adding up | |
1834 matrix heights of windows in the sequence. | |
1835 | |
1836 |<---- result width -->| | |
1837 +---------+ --- | |
1838 | | | | |
1839 | | | | |
1840 +---------+--+ | | |
1841 | | | | |
1842 | | result height | |
1843 | | | |
1844 +------------+---------+ | | |
1845 | | | | |
1846 | | | | |
1847 +------------+---------+ --- */ | |
1848 | |
1849 /* Bit indicating that a new matrix will be allocated or has been | |
1850 allocated. */ | |
1851 | |
1852 #define NEW_LEAF_MATRIX (1 << 0) | |
1853 | |
1854 /* Bit indicating that a matrix will or has changed its location or | |
1855 size. */ | |
1856 | |
1857 #define CHANGED_LEAF_MATRIX (1 << 1) | |
1858 | |
1859 static struct dim | |
1860 allocate_matrices_for_frame_redisplay (window, x, y, ch_dim, | |
1861 dim_only_p, window_change_flags) | |
1862 Lisp_Object window; | |
1863 int x, y; | |
1864 struct dim ch_dim; | |
1865 int dim_only_p; | |
1866 int *window_change_flags; | |
1867 { | |
1868 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | |
1869 int x0 = x, y0 = y; | |
1870 int wmax = 0, hmax = 0; | |
1871 struct dim total; | |
1872 struct dim dim; | |
1873 struct window *w; | |
1874 int in_horz_combination_p; | |
1875 | |
1876 /* What combination is WINDOW part of? Compute this once since the | |
1877 result is the same for all windows in the `next' chain. The | |
1878 special case of a root window (parent equal to nil) is treated | |
1879 like a vertical combination because a root window's `next' | |
1880 points to the mini-buffer window, if any, which is arranged | |
1881 vertically below other windows. */ | |
1882 in_horz_combination_p | |
1883 = (!NILP (XWINDOW (window)->parent) | |
1884 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild)); | |
1885 | |
1886 /* For WINDOW and all windows on the same level. */ | |
1887 do | |
1888 { | |
1889 w = XWINDOW (window); | |
1890 | |
1891 /* Get the dimension of the window sub-matrix for W, depending | |
1892 on whether this a combination or a leaf window. */ | |
1893 if (!NILP (w->hchild)) | |
1894 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, ch_dim, | |
1895 dim_only_p, | |
1896 window_change_flags); | |
1897 else if (!NILP (w->vchild)) | |
1898 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, ch_dim, | |
1899 dim_only_p, | |
1900 window_change_flags); | |
1901 else | |
1902 { | |
1903 /* If not already done, allocate sub-matrix structures. */ | |
1904 if (w->desired_matrix == NULL) | |
1905 { | |
1906 w->desired_matrix = new_glyph_matrix (f->desired_pool); | |
1907 w->current_matrix = new_glyph_matrix (f->current_pool); | |
1908 *window_change_flags |= NEW_LEAF_MATRIX; | |
1909 } | |
1910 | |
1911 /* Width and height MUST be chosen so that there are no | |
1912 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
|
1913 dim.width = XINT (w->width); |
b6f06a755c7d
make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents:
28361
diff
changeset
|
1914 dim.height = XINT (w->height); |
25012 | 1915 |
1916 /* Will matrix be re-allocated? */ | |
1917 if (x != w->desired_matrix->matrix_x | |
1918 || y != w->desired_matrix->matrix_y | |
1919 || dim.width != w->desired_matrix->matrix_w | |
1920 || dim.height != w->desired_matrix->matrix_h | |
1921 || (margin_glyphs_to_reserve (w, dim.width, | |
1922 w->right_margin_width) | |
1923 != w->desired_matrix->left_margin_glyphs) | |
1924 || (margin_glyphs_to_reserve (w, dim.width, | |
1925 w->left_margin_width) | |
1926 != w->desired_matrix->right_margin_glyphs)) | |
1927 *window_change_flags |= CHANGED_LEAF_MATRIX; | |
1928 | |
1929 /* Actually change matrices, if allowed. Do not consider | |
1930 CHANGED_LEAF_MATRIX computed above here because the pool | |
1931 may have been changed which we don't now here. We trust | |
1932 that we only will be called with DIM_ONLY_P != 0 when | |
1933 necessary. */ | |
1934 if (!dim_only_p) | |
1935 { | |
1936 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim); | |
1937 adjust_glyph_matrix (w, w->current_matrix, x, y, dim); | |
1938 } | |
1939 } | |
1940 | |
1941 /* If we are part of a horizontal combination, advance x for | |
1942 windows to the right of W; otherwise advance y for windows | |
1943 below W. */ | |
1944 if (in_horz_combination_p) | |
1945 x += dim.width; | |
1946 else | |
1947 y += dim.height; | |
1948 | |
1949 /* Remember maximum glyph matrix dimensions. */ | |
1950 wmax = max (wmax, dim.width); | |
1951 hmax = max (hmax, dim.height); | |
1952 | |
1953 /* Next window on same level. */ | |
1954 window = w->next; | |
1955 } | |
1956 while (!NILP (window)); | |
1957 | |
1958 /* Set `total' to the total glyph matrix dimension of this window | |
1959 level. In a vertical combination, the width is the width of the | |
1960 widest window; the height is the y we finally reached, corrected | |
1961 by the y we started with. In a horizontal combination, the total | |
1962 height is the height of the tallest window, and the width is the | |
1963 x we finally reached, corrected by the x we started with. */ | |
1964 if (in_horz_combination_p) | |
1965 { | |
1966 total.width = x - x0; | |
1967 total.height = hmax; | |
1968 } | |
1969 else | |
1970 { | |
1971 total.width = wmax; | |
1972 total.height = y - y0; | |
1973 } | |
1974 | |
1975 return total; | |
1976 } | |
1977 | |
1978 | |
1979 /* Allocate window matrices for window-based redisplay. W is the | |
1980 window whose matrices must be allocated/reallocated. CH_DIM is the | |
1981 size of the smallest character that could potentially be used on W. */ | |
1982 | |
1983 static void | |
1984 allocate_matrices_for_window_redisplay (w, ch_dim) | |
1985 struct window *w; | |
1986 struct dim ch_dim; | |
1987 { | |
1988 struct frame *f = XFRAME (w->frame); | |
1989 | |
1990 while (w) | |
314 | 1991 { |
25012 | 1992 if (!NILP (w->vchild)) |
1993 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild), ch_dim); | |
1994 else if (!NILP (w->hchild)) | |
1995 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild), ch_dim); | |
1996 else | |
314 | 1997 { |
25012 | 1998 /* W is a leaf window. */ |
1999 int window_pixel_width = XFLOATINT (w->width) * CANON_X_UNIT (f); | |
2000 int window_pixel_height = window_box_height (w) + abs (w->vscroll); | |
2001 struct dim dim; | |
2002 | |
2003 /* If matrices are not yet allocated, allocate them now. */ | |
2004 if (w->desired_matrix == NULL) | |
314 | 2005 { |
25012 | 2006 w->desired_matrix = new_glyph_matrix (NULL); |
2007 w->current_matrix = new_glyph_matrix (NULL); | |
314 | 2008 } |
25012 | 2009 |
2010 /* Compute number of glyphs needed in a glyph row. */ | |
2011 dim.width = (((window_pixel_width + ch_dim.width - 1) | |
2012 / ch_dim.width) | |
2013 /* 2 partially visible columns in the text area. */ | |
2014 + 2 | |
2015 /* One partially visible column at the right | |
2016 edge of each marginal area. */ | |
2017 + 1 + 1); | |
2018 | |
2019 /* Compute number of glyph rows needed. */ | |
2020 dim.height = (((window_pixel_height + ch_dim.height - 1) | |
2021 / ch_dim.height) | |
2022 /* One partially visible line at the top and | |
2023 bottom of the window. */ | |
2024 + 2 | |
2025 /* 2 for top and mode line. */ | |
2026 + 2); | |
2027 | |
2028 /* Change matrices. */ | |
2029 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); | |
2030 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim); | |
2031 } | |
2032 | |
2033 w = NILP (w->next) ? NULL : XWINDOW (w->next); | |
2034 } | |
2035 } | |
2036 | |
2037 | |
2038 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null, | |
2039 do it for all frames; otherwise do it just for the given frame. | |
2040 This function must be called when a new frame is created, its size | |
2041 changes, or its window configuration changes. */ | |
2042 | |
2043 void | |
2044 adjust_glyphs (f) | |
2045 struct frame *f; | |
2046 { | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2047 /* 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
|
2048 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
|
2049 BLOCK_INPUT; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2050 |
25012 | 2051 if (f) |
2052 adjust_frame_glyphs (f); | |
2053 else | |
2054 { | |
2055 Lisp_Object tail, lisp_frame; | |
2056 | |
2057 FOR_EACH_FRAME (tail, lisp_frame) | |
2058 adjust_frame_glyphs (XFRAME (lisp_frame)); | |
2059 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2060 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2061 UNBLOCK_INPUT; |
25012 | 2062 } |
2063 | |
2064 | |
2065 /* Adjust frame glyphs when Emacs is initialized. | |
2066 | |
2067 To be called from init_display. | |
2068 | |
2069 We need a glyph matrix because redraw will happen soon. | |
2070 Unfortunately, window sizes on selected_frame are not yet set to | |
2071 meaningful values. I believe we can assume that there are only two | |
2072 windows on the frame---the mini-buffer and the root window. Frame | |
2073 height and width seem to be correct so far. So, set the sizes of | |
2074 windows to estimated values. */ | |
2075 | |
2076 static void | |
2077 adjust_frame_glyphs_initially () | |
2078 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2079 struct frame *sf = SELECTED_FRAME (); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2080 struct window *root = XWINDOW (sf->root_window); |
25012 | 2081 struct window *mini = XWINDOW (root->next); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2082 int frame_height = FRAME_HEIGHT (sf); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2083 int frame_width = FRAME_WIDTH (sf); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2084 int top_margin = FRAME_TOP_MARGIN (sf); |
25012 | 2085 |
2086 /* Do it for the root window. */ | |
2087 XSETFASTINT (root->top, top_margin); | |
2088 XSETFASTINT (root->width, frame_width); | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2089 set_window_height (sf->root_window, frame_height - 1 - top_margin, 0); |
25012 | 2090 |
2091 /* Do it for the mini-buffer window. */ | |
2092 XSETFASTINT (mini->top, frame_height - 1); | |
2093 XSETFASTINT (mini->width, frame_width); | |
2094 set_window_height (root->next, 1, 0); | |
2095 | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2096 adjust_frame_glyphs (sf); |
25012 | 2097 glyphs_initialized_initially_p = 1; |
2098 } | |
2099 | |
2100 | |
2101 /* Allocate/reallocate glyph matrices of a single frame F. */ | |
2102 | |
2103 static void | |
2104 adjust_frame_glyphs (f) | |
2105 struct frame *f; | |
2106 { | |
2107 if (FRAME_WINDOW_P (f)) | |
2108 adjust_frame_glyphs_for_window_redisplay (f); | |
2109 else | |
2110 adjust_frame_glyphs_for_frame_redisplay (f); | |
2111 | |
2112 /* Don't forget the message buffer and the buffer for | |
2113 decode_mode_spec. */ | |
2114 adjust_frame_message_buffer (f); | |
2115 adjust_decode_mode_spec_buffer (f); | |
2116 | |
2117 f->glyphs_initialized_p = 1; | |
2118 } | |
2119 | |
2120 | |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2121 /* 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
|
2122 windows from the frame's current matrix. */ |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2123 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2124 static void |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2125 fake_current_matrices (window) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2126 Lisp_Object window; |
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 struct window *w; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2129 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2130 for (; !NILP (window); window = w->next) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2131 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2132 w = XWINDOW (window); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2133 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2134 if (!NILP (w->hchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2135 fake_current_matrices (w->hchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2136 else if (!NILP (w->vchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2137 fake_current_matrices (w->vchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2138 else |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2139 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2140 int i; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2141 struct frame *f = XFRAME (w->frame); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2142 struct glyph_matrix *m = w->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2143 struct glyph_matrix *fm = f->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2144 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2145 xassert (m->matrix_h == XFASTINT (w->height)); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2146 xassert (m->matrix_w == XFASTINT (w->width)); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2147 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2148 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
|
2149 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2150 struct glyph_row *r = m->rows + i; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2151 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
|
2152 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2153 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
|
2154 && 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
|
2155 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2156 r->enabled_p = fr->enabled_p; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2157 if (r->enabled_p) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2158 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2159 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
|
2160 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
|
2161 r->used[TEXT_AREA] = (m->matrix_w |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2162 - r->used[LEFT_MARGIN_AREA] |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2163 - r->used[RIGHT_MARGIN_AREA]); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2164 r->mode_line_p = 0; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2165 r->inverse_p = fr->inverse_p; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2166 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2167 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2168 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2169 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2170 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2171 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2172 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2173 /* Save away the contents of frame F's current frame matrix. Value is |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2174 a glyph matrix holding the contents of F's current frame matrix. '*/ |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2175 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2176 static struct glyph_matrix * |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2177 save_current_matrix (f) |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2178 struct frame *f; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2179 { |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2180 int i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2181 struct glyph_matrix *saved; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2182 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2183 saved = (struct glyph_matrix *) xmalloc (sizeof *saved); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2184 bzero (saved, sizeof *saved); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2185 saved->nrows = f->current_matrix->nrows; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2186 saved->rows = (struct glyph_row *) xmalloc (saved->nrows |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2187 * sizeof *saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2188 bzero (saved->rows, saved->nrows * sizeof *saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2189 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2190 for (i = 0; i < saved->nrows; ++i) |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2191 { |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2192 struct glyph_row *from = f->current_matrix->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2193 struct glyph_row *to = saved->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2194 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2195 to->glyphs[TEXT_AREA] = (struct glyph *) xmalloc (nbytes); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2196 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2197 to->used[TEXT_AREA] = from->used[TEXT_AREA]; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2198 } |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2199 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2200 return saved; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2201 } |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2202 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2203 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2204 /* Restore the contents of frame F's current frame matrix from SAVED, |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2205 and free memory associated with SAVED. */ |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2206 |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2207 static void |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2208 restore_current_matrix (f, saved) |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2209 struct frame *f; |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2210 struct glyph_matrix *saved; |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2211 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2212 int i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2213 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2214 for (i = 0; i < saved->nrows; ++i) |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2215 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2216 struct glyph_row *from = saved->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2217 struct glyph_row *to = f->current_matrix->rows + i; |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2218 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2219 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2220 to->used[TEXT_AREA] = from->used[TEXT_AREA]; |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2221 xfree (from->glyphs[TEXT_AREA]); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2222 } |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2223 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2224 xfree (saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2225 xfree (saved); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2226 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2227 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2228 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2229 |
25012 | 2230 /* Allocate/reallocate glyph matrices of a single frame F for |
2231 frame-based redisplay. */ | |
2232 | |
2233 static void | |
2234 adjust_frame_glyphs_for_frame_redisplay (f) | |
2235 struct frame *f; | |
2236 { | |
2237 struct dim ch_dim; | |
2238 struct dim matrix_dim; | |
2239 int pool_changed_p; | |
2240 int window_change_flags; | |
2241 int top_window_y; | |
2242 | |
2243 if (!FRAME_LIVE_P (f)) | |
2244 return; | |
2245 | |
2246 /* Determine the smallest character in any font for F. On | |
2247 console windows, all characters have dimension (1, 1). */ | |
2248 ch_dim.width = ch_dim.height = 1; | |
2249 | |
2250 top_window_y = FRAME_TOP_MARGIN (f); | |
2251 | |
2252 /* Allocate glyph pool structures if not already done. */ | |
2253 if (f->desired_pool == NULL) | |
2254 { | |
2255 f->desired_pool = new_glyph_pool (); | |
2256 f->current_pool = new_glyph_pool (); | |
2257 } | |
2258 | |
2259 /* Allocate frames matrix structures if needed. */ | |
2260 if (f->desired_matrix == NULL) | |
2261 { | |
2262 f->desired_matrix = new_glyph_matrix (f->desired_pool); | |
2263 f->current_matrix = new_glyph_matrix (f->current_pool); | |
2264 } | |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2265 |
25012 | 2266 /* Compute window glyph matrices. (This takes the mini-buffer |
2267 window into account). The result is the size of the frame glyph | |
2268 matrix needed. The variable window_change_flags is set to a bit | |
2269 mask indicating whether new matrices will be allocated or | |
2270 existing matrices change their size or location within the frame | |
2271 matrix. */ | |
2272 window_change_flags = 0; | |
2273 matrix_dim | |
2274 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
2275 0, top_window_y, | |
2276 ch_dim, 1, | |
2277 &window_change_flags); | |
2278 | |
2279 /* Add in menu bar lines, if any. */ | |
2280 matrix_dim.height += top_window_y; | |
2281 | |
2282 /* Enlarge pools as necessary. */ | |
2283 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim); | |
2284 realloc_glyph_pool (f->current_pool, matrix_dim); | |
2285 | |
2286 /* Set up glyph pointers within window matrices. Do this only if | |
2287 absolutely necessary since it requires a frame redraw. */ | |
2288 if (pool_changed_p || window_change_flags) | |
2289 { | |
2290 /* Do it for window matrices. */ | |
2291 allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
2292 0, top_window_y, ch_dim, 0, | |
2293 &window_change_flags); | |
2294 | |
2295 /* Size of frame matrices must equal size of frame. Note | |
2296 that we are called for X frames with window widths NOT equal | |
2297 to the frame width (from CHANGE_FRAME_SIZE_1). */ | |
2298 xassert (matrix_dim.width == FRAME_WIDTH (f) | |
2299 && matrix_dim.height == FRAME_HEIGHT (f)); | |
2300 | |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2301 /* Pointers to glyph memory in glyph rows are exchanged during |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2302 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
|
2303 frame's current matrix consists of pointers into both the |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2304 desired and current glyph pool of the frame. Adjusting a |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2305 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
|
2306 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
|
2307 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
|
2308 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
|
2309 matrix' contents from that copy. */ |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2310 if (display_completed |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2311 && !FRAME_GARBAGED_P (f) |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2312 && matrix_dim.width == f->current_matrix->matrix_w |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2313 && matrix_dim.height == f->current_matrix->matrix_h) |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2314 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2315 struct glyph_matrix *copy = save_current_matrix (f); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2316 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
|
2317 adjust_glyph_matrix (NULL, f->current_matrix, 0, 0, matrix_dim); |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2318 restore_current_matrix (f, copy); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2319 fake_current_matrices (FRAME_ROOT_WINDOW (f)); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2320 } |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2321 else |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2322 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2323 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
|
2324 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
|
2325 SET_FRAME_GARBAGED (f); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2326 } |
25012 | 2327 } |
2328 } | |
2329 | |
2330 | |
2331 /* Allocate/reallocate glyph matrices of a single frame F for | |
2332 window-based redisplay. */ | |
2333 | |
2334 static void | |
2335 adjust_frame_glyphs_for_window_redisplay (f) | |
2336 struct frame *f; | |
2337 { | |
2338 struct dim ch_dim; | |
2339 struct window *w; | |
2340 | |
2341 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f)); | |
2342 | |
2343 /* Get minimum sizes. */ | |
2344 #ifdef HAVE_WINDOW_SYSTEM | |
2345 ch_dim.width = FRAME_SMALLEST_CHAR_WIDTH (f); | |
2346 ch_dim.height = FRAME_SMALLEST_FONT_HEIGHT (f); | |
2347 #else | |
2348 ch_dim.width = ch_dim.height = 1; | |
2349 #endif | |
2350 | |
2351 /* Allocate/reallocate window matrices. */ | |
2352 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f)), | |
2353 ch_dim); | |
2354 | |
2355 /* Allocate/ reallocate matrices of the dummy window used to display | |
2356 the menu bar under X when no X toolkit support is available. */ | |
2357 #ifndef USE_X_TOOLKIT | |
2358 { | |
2359 /* Allocate a dummy window if not already done. */ | |
2360 if (NILP (f->menu_bar_window)) | |
2361 { | |
2362 f->menu_bar_window = make_window (); | |
2363 w = XWINDOW (f->menu_bar_window); | |
2364 XSETFRAME (w->frame, f); | |
2365 w->pseudo_window_p = 1; | |
2366 } | |
2367 else | |
2368 w = XWINDOW (f->menu_bar_window); | |
2369 | |
2370 /* Set window dimensions to frame dimensions and allocate or | |
2371 adjust glyph matrices of W. */ | |
2372 XSETFASTINT (w->top, 0); | |
2373 XSETFASTINT (w->left, 0); | |
2374 XSETFASTINT (w->height, FRAME_MENU_BAR_LINES (f)); | |
2375 XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f)); | |
2376 allocate_matrices_for_window_redisplay (w, ch_dim); | |
2377 } | |
2378 #endif /* not USE_X_TOOLKIT */ | |
2379 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2380 /* 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
|
2381 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
|
2382 if (NILP (f->tool_bar_window)) |
25012 | 2383 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2384 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
|
2385 w = XWINDOW (f->tool_bar_window); |
25012 | 2386 XSETFRAME (w->frame, f); |
2387 w->pseudo_window_p = 1; | |
2388 } | |
2389 else | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2390 w = XWINDOW (f->tool_bar_window); |
25012 | 2391 |
2392 XSETFASTINT (w->top, FRAME_MENU_BAR_LINES (f)); | |
2393 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
|
2394 XSETFASTINT (w->height, FRAME_TOOL_BAR_LINES (f)); |
25012 | 2395 XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f)); |
2396 allocate_matrices_for_window_redisplay (w, ch_dim); | |
2397 } | |
2398 | |
2399 | |
2400 /* Adjust/ allocate message buffer of frame F. | |
2401 | |
2402 Note that the message buffer is never freed. Since I could not | |
2403 find a free in 19.34, I assume that freeing it would be | |
2404 problematic in some way and don't do it either. | |
2405 | |
2406 (Implementation note: It should be checked if we can free it | |
2407 eventually without causing trouble). */ | |
2408 | |
2409 static void | |
2410 adjust_frame_message_buffer (f) | |
2411 struct frame *f; | |
2412 { | |
2413 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1; | |
2414 | |
2415 if (FRAME_MESSAGE_BUF (f)) | |
2416 { | |
2417 char *buffer = FRAME_MESSAGE_BUF (f); | |
2418 char *new_buffer = (char *) xrealloc (buffer, size); | |
2419 FRAME_MESSAGE_BUF (f) = new_buffer; | |
2420 } | |
2421 else | |
2422 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size); | |
2423 } | |
2424 | |
2425 | |
2426 /* Re-allocate buffer for decode_mode_spec on frame F. */ | |
2427 | |
2428 static void | |
2429 adjust_decode_mode_spec_buffer (f) | |
2430 struct frame *f; | |
2431 { | |
2432 f->decode_mode_spec_buffer | |
2433 = (char *) xrealloc (f->decode_mode_spec_buffer, | |
2434 FRAME_MESSAGE_BUF_SIZE (f) + 1); | |
2435 } | |
2436 | |
2437 | |
2438 | |
2439 /********************************************************************** | |
2440 Freeing Glyph Matrices | |
2441 **********************************************************************/ | |
2442 | |
2443 /* Free glyph memory for a frame F. F may be null. This function can | |
2444 be called for the same frame more than once. The root window of | |
2445 F may be nil when this function is called. This is the case when | |
2446 the function is called when F is destroyed. */ | |
2447 | |
2448 void | |
2449 free_glyphs (f) | |
2450 struct frame *f; | |
2451 { | |
2452 if (f && f->glyphs_initialized_p) | |
2453 { | |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2454 /* 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
|
2455 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
|
2456 BLOCK_INPUT; |
25012 | 2457 f->glyphs_initialized_p = 0; |
2458 | |
2459 /* Release window sub-matrices. */ | |
2460 if (!NILP (f->root_window)) | |
2461 free_window_matrices (XWINDOW (f->root_window)); | |
2462 | |
2463 /* Free the dummy window for menu bars without X toolkit and its | |
2464 glyph matrices. */ | |
2465 if (!NILP (f->menu_bar_window)) | |
2466 { | |
2467 struct window *w = XWINDOW (f->menu_bar_window); | |
2468 free_glyph_matrix (w->desired_matrix); | |
2469 free_glyph_matrix (w->current_matrix); | |
2470 w->desired_matrix = w->current_matrix = NULL; | |
2471 f->menu_bar_window = Qnil; | |
2472 } | |
2473 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2474 /* 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
|
2475 if (!NILP (f->tool_bar_window)) |
25012 | 2476 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2477 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 2478 free_glyph_matrix (w->desired_matrix); |
2479 free_glyph_matrix (w->current_matrix); | |
2480 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
|
2481 f->tool_bar_window = Qnil; |
25012 | 2482 } |
2483 | |
2484 /* Release frame glyph matrices. Reset fields to zero in | |
2485 case we are called a second time. */ | |
2486 if (f->desired_matrix) | |
2487 { | |
2488 free_glyph_matrix (f->desired_matrix); | |
2489 free_glyph_matrix (f->current_matrix); | |
2490 f->desired_matrix = f->current_matrix = NULL; | |
2491 } | |
2492 | |
2493 /* Release glyph pools. */ | |
2494 if (f->desired_pool) | |
2495 { | |
2496 free_glyph_pool (f->desired_pool); | |
2497 free_glyph_pool (f->current_pool); | |
2498 f->desired_pool = f->current_pool = NULL; | |
314 | 2499 } |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2500 |
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2501 UNBLOCK_INPUT; |
314 | 2502 } |
2503 } | |
2504 | |
25012 | 2505 |
2506 /* Free glyph sub-matrices in the window tree rooted at W. This | |
2507 function may be called with a null pointer, and it may be called on | |
2508 the same tree more than once. */ | |
2509 | |
2510 void | |
2511 free_window_matrices (w) | |
2512 struct window *w; | |
2513 { | |
2514 while (w) | |
2515 { | |
2516 if (!NILP (w->hchild)) | |
2517 free_window_matrices (XWINDOW (w->hchild)); | |
2518 else if (!NILP (w->vchild)) | |
2519 free_window_matrices (XWINDOW (w->vchild)); | |
2520 else | |
2521 { | |
2522 /* This is a leaf window. Free its memory and reset fields | |
2523 to zero in case this function is called a second time for | |
2524 W. */ | |
2525 free_glyph_matrix (w->current_matrix); | |
2526 free_glyph_matrix (w->desired_matrix); | |
2527 w->current_matrix = w->desired_matrix = NULL; | |
2528 } | |
2529 | |
2530 /* Next window on same level. */ | |
2531 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
2532 } | |
2533 } | |
2534 | |
2535 | |
2536 /* Check glyph memory leaks. This function is called from | |
2537 shut_down_emacs. Note that frames are not destroyed when Emacs | |
2538 exits. We therefore free all glyph memory for all active frames | |
2539 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
|
2540 |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2541 void |
25012 | 2542 check_glyph_memory () |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2543 { |
25012 | 2544 Lisp_Object tail, frame; |
2545 | |
2546 /* Free glyph memory for all frames. */ | |
2547 FOR_EACH_FRAME (tail, frame) | |
2548 free_glyphs (XFRAME (frame)); | |
2549 | |
2550 /* Check that nothing is left allocated. */ | |
2551 if (glyph_matrix_count) | |
2552 abort (); | |
2553 if (glyph_pool_count) | |
2554 abort (); | |
2555 } | |
2556 | |
2557 | |
2558 | |
2559 /********************************************************************** | |
2560 Building a Frame Matrix | |
2561 **********************************************************************/ | |
2562 | |
2563 /* Most of the redisplay code works on glyph matrices attached to | |
2564 windows. This is a good solution most of the time, but it is not | |
2565 suitable for terminal code. Terminal output functions cannot rely | |
2566 on being able to set an arbitrary terminal window. Instead they | |
2567 must be provided with a view of the whole frame, i.e. the whole | |
2568 screen. We build such a view by constructing a frame matrix from | |
2569 window matrices in this section. | |
2570 | |
2571 Windows that must be updated have their must_be_update_p flag set. | |
2572 For all such windows, their desired matrix is made part of the | |
2573 desired frame matrix. For other windows, their current matrix is | |
2574 made part of the desired frame matrix. | |
2575 | |
2576 +-----------------+----------------+ | |
2577 | desired | desired | | |
2578 | | | | |
2579 +-----------------+----------------+ | |
2580 | current | | |
2581 | | | |
2582 +----------------------------------+ | |
2583 | |
2584 Desired window matrices can be made part of the frame matrix in a | |
2585 cheap way: We exploit the fact that the desired frame matrix and | |
2586 desired window matrices share their glyph memory. This is not | |
2587 possible for current window matrices. Their glyphs are copied to | |
2588 the desired frame matrix. The latter is equivalent to | |
2589 preserve_other_columns in the old redisplay. | |
2590 | |
2591 Used glyphs counters for frame matrix rows are the result of adding | |
2592 up glyph lengths of the window matrices. A line in the frame | |
2593 matrix is enabled, if a corresponding line in a window matrix is | |
2594 enabled. | |
2595 | |
2596 After building the desired frame matrix, it will be passed to | |
2597 terminal code, which will manipulate both the desired and current | |
2598 frame matrix. Changes applied to the frame's current matrix have | |
2599 to be visible in current window matrices afterwards, of course. | |
2600 | |
2601 This problem is solved like this: | |
2602 | |
2603 1. Window and frame matrices share glyphs. Window matrices are | |
2604 constructed in a way that their glyph contents ARE the glyph | |
2605 contents needed in a frame matrix. Thus, any modification of | |
2606 glyphs done in terminal code will be reflected in window matrices | |
2607 automatically. | |
2608 | |
2609 2. Exchanges of rows in a frame matrix done by terminal code are | |
2610 intercepted by hook functions so that corresponding row operations | |
2611 on window matrices can be performed. This is necessary because we | |
2612 use pointers to glyphs in glyph row structures. To satisfy the | |
2613 assumption of point 1 above that glyphs are updated implicitly in | |
2614 window matrices when they are manipulated via the frame matrix, | |
2615 window and frame matrix must of course agree where to find the | |
2616 glyphs for their rows. Possible manipulations that must be | |
2617 mirrored are assignments of rows of the desired frame matrix to the | |
2618 current frame matrix and scrolling the current frame matrix. */ | |
2619 | |
2620 /* Build frame F's desired matrix from window matrices. Only windows | |
2621 which have the flag must_be_updated_p set have to be updated. Menu | |
2622 bar lines of a frame are not covered by window matrices, so make | |
2623 sure not to touch them in this function. */ | |
2624 | |
2625 static void | |
2626 build_frame_matrix (f) | |
2627 struct frame *f; | |
2628 { | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2629 int i; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2630 |
25012 | 2631 /* F must have a frame matrix when this function is called. */ |
2632 xassert (!FRAME_WINDOW_P (f)); | |
2633 | |
2634 /* Clear all rows in the frame matrix covered by window matrices. | |
2635 Menu bar lines are not covered by windows. */ | |
2636 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i) | |
2637 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i)); | |
2638 | |
2639 /* Build the matrix by walking the window tree. */ | |
2640 build_frame_matrix_from_window_tree (f->desired_matrix, | |
2641 XWINDOW (FRAME_ROOT_WINDOW (f))); | |
2642 } | |
2643 | |
2644 | |
2645 /* Walk a window tree, building a frame matrix MATRIX from window | |
2646 matrices. W is the root of a window tree. */ | |
2647 | |
2648 static void | |
2649 build_frame_matrix_from_window_tree (matrix, w) | |
2650 struct glyph_matrix *matrix; | |
2651 struct window *w; | |
2652 { | |
2653 while (w) | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2654 { |
25012 | 2655 if (!NILP (w->hchild)) |
2656 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild)); | |
2657 else if (!NILP (w->vchild)) | |
2658 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild)); | |
2659 else | |
2660 build_frame_matrix_from_leaf_window (matrix, w); | |
2661 | |
2662 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
|
2663 } |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2664 } |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2665 |
25012 | 2666 |
2667 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the | |
2668 desired frame matrix built. W is a leaf window whose desired or | |
2669 current matrix is to be added to FRAME_MATRIX. W's flag | |
2670 must_be_updated_p determines which matrix it contributes to | |
2671 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix | |
2672 is added to FRAME_MATRIX, otherwise W's current matrix is added. | |
2673 Adding a desired matrix means setting up used counters and such in | |
2674 frame rows, while adding a current window matrix to FRAME_MATRIX | |
2675 means copying glyphs. The latter case corresponds to | |
2676 preserve_other_columns in the old redisplay. */ | |
2677 | |
2678 static void | |
2679 build_frame_matrix_from_leaf_window (frame_matrix, w) | |
2680 struct glyph_matrix *frame_matrix; | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2681 struct window *w; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2682 { |
25012 | 2683 struct glyph_matrix *window_matrix; |
2684 int window_y, frame_y; | |
2685 /* If non-zero, a glyph to insert at the right border of W. */ | |
2686 GLYPH right_border_glyph = 0; | |
2687 | |
2688 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */ | |
2689 if (w->must_be_updated_p) | |
2690 { | |
2691 window_matrix = w->desired_matrix; | |
2692 | |
2693 /* Decide whether we want to add a vertical border glyph. */ | |
2694 if (!WINDOW_RIGHTMOST_P (w)) | |
2695 { | |
2696 struct Lisp_Char_Table *dp = window_display_table (w); | |
2697 right_border_glyph = (dp && INTEGERP (DISP_BORDER_GLYPH (dp)) | |
2698 ? XINT (DISP_BORDER_GLYPH (dp)) | |
2699 : '|'); | |
2700 } | |
2701 } | |
2702 else | |
2703 window_matrix = w->current_matrix; | |
2704 | |
2705 /* For all rows in the window matrix and corresponding rows in the | |
2706 frame matrix. */ | |
2707 window_y = 0; | |
2708 frame_y = window_matrix->matrix_y; | |
2709 while (window_y < window_matrix->nrows) | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2710 { |
25012 | 2711 struct glyph_row *frame_row = frame_matrix->rows + frame_y; |
2712 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
|
2713 int current_row_p = window_matrix == w->current_matrix; |
25012 | 2714 |
2715 /* Fill up the frame row with spaces up to the left margin of the | |
2716 window row. */ | |
2717 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x); | |
2718 | |
2719 /* Fill up areas in the window matrix row with spaces. */ | |
2720 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
|
2721 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2722 /* 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
|
2723 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
|
2724 row instead. */ |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2725 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
|
2726 && !window_row->enabled_p) |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2727 { |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2728 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
|
2729 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
|
2730 } |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2731 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2732 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
|
2733 { |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2734 /* Copy window row to frame row. */ |
25012 | 2735 bcopy (window_row->glyphs[0], |
2736 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x, | |
2737 window_matrix->matrix_w * sizeof (struct glyph)); | |
2738 } | |
2739 else | |
2740 { | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2741 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
|
2742 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2743 /* 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
|
2744 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
|
2745 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
|
2746 |
25012 | 2747 /* Maybe insert a vertical border between horizontally adjacent |
2748 windows. */ | |
2749 if (right_border_glyph) | |
2750 { | |
2751 struct glyph *border = window_row->glyphs[LAST_AREA] - 1; | |
2752 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); | |
2753 } | |
2754 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2755 /* 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
|
2756 frame_y. */ |
25012 | 2757 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
|
2758 |
25012 | 2759 /* If rows are in sync, we don't have to copy glyphs because |
2760 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
|
2761 |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2762 #if GLYPH_DEBUG |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2763 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
|
2764 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
|
2765 #endif |
25012 | 2766 } |
2767 | |
2768 /* Set number of used glyphs in the frame matrix. Since we fill | |
2769 up with spaces, and visit leaf windows from left to right it | |
2770 can be done simply. */ | |
2771 frame_row->used[TEXT_AREA] | |
2772 = window_matrix->matrix_x + window_matrix->matrix_w; | |
2773 | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2774 /* Or in other flags. */ |
25012 | 2775 frame_row->inverse_p |= window_row->inverse_p; |
2776 | |
2777 /* Next row. */ | |
2778 ++window_y; | |
2779 ++frame_y; | |
2780 } | |
2781 } | |
2782 | |
2783 | |
2784 /* Add spaces to a glyph row ROW in a window matrix. | |
2785 | |
2786 Each row has the form: | |
2787 | |
2788 +---------+-----------------------------+------------+ | |
2789 | left | text | right | | |
2790 +---------+-----------------------------+------------+ | |
2791 | |
2792 Left and right marginal areas are optional. This function adds | |
2793 spaces to areas so that there are no empty holes between areas. | |
2794 In other words: If the right area is not empty, the text area | |
2795 is filled up with spaces up to the right area. If the text area | |
2796 is not empty, the left area is filled up. | |
2797 | |
2798 To be called for frame-based redisplay, only. */ | |
2799 | |
2800 static void | |
2801 fill_up_glyph_row_with_spaces (row) | |
2802 struct glyph_row *row; | |
2803 { | |
2804 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA); | |
2805 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA); | |
2806 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA); | |
2807 } | |
2808 | |
2809 | |
2810 /* Fill area AREA of glyph row ROW with spaces. To be called for | |
2811 frame-based redisplay only. */ | |
2812 | |
2813 static void | |
2814 fill_up_glyph_row_area_with_spaces (row, area) | |
2815 struct glyph_row *row; | |
2816 int area; | |
2817 { | |
2818 if (row->glyphs[area] < row->glyphs[area + 1]) | |
2819 { | |
2820 struct glyph *end = row->glyphs[area + 1]; | |
2821 struct glyph *text = row->glyphs[area] + row->used[area]; | |
2822 | |
2823 while (text < end) | |
2824 *text++ = space_glyph; | |
2825 row->used[area] = text - row->glyphs[area]; | |
2826 } | |
2827 } | |
2828 | |
2829 | |
2830 /* Add spaces to the end of ROW in a frame matrix until index UPTO is | |
2831 reached. In frame matrices only one area, TEXT_AREA, is used. */ | |
2832 | |
2833 static void | |
2834 fill_up_frame_row_with_spaces (row, upto) | |
2835 struct glyph_row *row; | |
2836 int upto; | |
2837 { | |
2838 int i = row->used[TEXT_AREA]; | |
2839 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
2840 | |
2841 while (i < upto) | |
2842 glyph[i++] = space_glyph; | |
2843 | |
2844 row->used[TEXT_AREA] = i; | |
2845 } | |
2846 | |
2847 | |
2848 | |
2849 /********************************************************************** | |
2850 Mirroring operations on frame matrices in window matrices | |
2851 **********************************************************************/ | |
2852 | |
2853 /* Set frame being updated via frame-based redisplay to F. This | |
2854 function must be called before updates to make explicit that we are | |
2855 working on frame matrices or not. */ | |
2856 | |
2857 static INLINE void | |
2858 set_frame_matrix_frame (f) | |
2859 struct frame *f; | |
2860 { | |
2861 frame_matrix_frame = f; | |
2862 } | |
2863 | |
2864 | |
2865 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date. | |
2866 DESIRED_MATRIX is the desired matrix corresponding to | |
2867 CURRENT_MATRIX. The update is done by exchanging glyph pointers | |
2868 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If | |
2869 frame_matrix_frame is non-null, this indicates that the exchange is | |
2870 done in frame matrices, and that we have to perform analogous | |
2871 operations in window matrices of frame_matrix_frame. */ | |
2872 | |
2873 static INLINE void | |
2874 make_current (desired_matrix, current_matrix, row) | |
2875 struct glyph_matrix *desired_matrix, *current_matrix; | |
2876 int row; | |
2877 { | |
2878 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); | |
2879 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
|
2880 int mouse_face_p = current_row->mouse_face_p; |
25012 | 2881 |
2882 /* Do current_row = desired_row. This exchanges glyph pointers | |
2883 between both rows, and does a structure assignment otherwise. */ | |
2884 assign_row (current_row, desired_row); | |
2885 | |
2886 /* Enable current_row to mark it as valid. */ | |
2887 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
|
2888 current_row->mouse_face_p = mouse_face_p; |
25012 | 2889 |
2890 /* If we are called on frame matrices, perform analogous operations | |
2891 for window matrices. */ | |
2892 if (frame_matrix_frame) | |
2893 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row); | |
2894 } | |
2895 | |
2896 | |
2897 /* W is the root of a window tree. FRAME_ROW is the index of a row in | |
2898 W's frame which has been made current (by swapping pointers between | |
2899 current and desired matrix). Perform analogous operations in the | |
2900 matrices of leaf windows in the window tree rooted at W. */ | |
2901 | |
2902 static void | |
2903 mirror_make_current (w, frame_row) | |
2904 struct window *w; | |
2905 int frame_row; | |
2906 { | |
2907 while (w) | |
2908 { | |
2909 if (!NILP (w->hchild)) | |
2910 mirror_make_current (XWINDOW (w->hchild), frame_row); | |
2911 else if (!NILP (w->vchild)) | |
2912 mirror_make_current (XWINDOW (w->vchild), frame_row); | |
2913 else | |
2914 { | |
2915 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS | |
2916 here because the checks performed in debug mode there | |
2917 will not allow the conversion. */ | |
2918 int row = frame_row - w->desired_matrix->matrix_y; | |
2919 | |
2920 /* If FRAME_ROW is within W, assign the desired row to the | |
2921 current row (exchanging glyph pointers). */ | |
2922 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
|
2923 { |
25012 | 2924 struct glyph_row *current_row |
2925 = MATRIX_ROW (w->current_matrix, row); | |
2926 struct glyph_row *desired_row | |
2927 = 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
|
2928 |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2929 if (desired_row->enabled_p) |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2930 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
|
2931 else |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2932 swap_glyph_pointers (desired_row, current_row); |
25012 | 2933 current_row->enabled_p = 1; |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2934 } |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2935 } |
25012 | 2936 |
2937 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2938 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2939 } |
25012 | 2940 |
2941 | |
2942 /* Perform row dance after scrolling. We are working on the range of | |
2943 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not | |
2944 including) in MATRIX. COPY_FROM is a vector containing, for each | |
2945 row I in the range 0 <= I < NLINES, the index of the original line | |
2946 to move to I. This index is relative to the row range, i.e. 0 <= | |
2947 index < NLINES. RETAINED_P is a vector containing zero for each | |
2948 row 0 <= I < NLINES which is empty. | |
2949 | |
2950 This function is called from do_scrolling and do_direct_scrolling. */ | |
2951 | |
2952 void | |
2953 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, | |
2954 retained_p) | |
2955 struct glyph_matrix *matrix; | |
2956 int unchanged_at_top, nlines; | |
2957 int *copy_from; | |
2958 char *retained_p; | |
2959 { | |
2960 /* A copy of original rows. */ | |
2961 struct glyph_row *old_rows; | |
2962 | |
2963 /* Rows to assign to. */ | |
2964 struct glyph_row *new_rows = MATRIX_ROW (matrix, unchanged_at_top); | |
2965 | |
2966 int i; | |
2967 | |
2968 /* Make a copy of the original rows. */ | |
2969 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows); | |
2970 bcopy (new_rows, old_rows, nlines * sizeof *old_rows); | |
2971 | |
2972 /* Assign new rows, maybe clear lines. */ | |
2973 for (i = 0; i < nlines; ++i) | |
2974 { | |
2975 int enabled_before_p = new_rows[i].enabled_p; | |
2976 | |
2977 xassert (i + unchanged_at_top < matrix->nrows); | |
2978 xassert (unchanged_at_top + copy_from[i] < matrix->nrows); | |
2979 new_rows[i] = old_rows[copy_from[i]]; | |
2980 new_rows[i].enabled_p = enabled_before_p; | |
2981 | |
2982 /* RETAINED_P is zero for empty lines. */ | |
2983 if (!retained_p[copy_from[i]]) | |
2984 new_rows[i].enabled_p = 0; | |
2985 } | |
2986 | |
2987 /* Do the same for window matrices, if MATRIX Is a frame matrix. */ | |
2988 if (frame_matrix_frame) | |
2989 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window), | |
2990 unchanged_at_top, nlines, copy_from, retained_p); | |
2991 } | |
2992 | |
2993 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2994 /* 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
|
2995 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
|
2996 frame. */ |
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 static void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2999 sync_window_with_frame_matrix_rows (w) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3000 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3001 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3002 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3003 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
|
3004 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3005 /* 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
|
3006 must have a frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3007 xassert (NILP (w->hchild) && NILP (w->vchild)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3008 xassert (WINDOW_FULL_WIDTH_P (w)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3009 xassert (!FRAME_WINDOW_P (f)); |
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 /* 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
|
3012 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
|
3013 corresponding frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3014 window_row = w->current_matrix->rows; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3015 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
|
3016 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
|
3017 while (window_row < window_row_end) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3018 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3019 int area; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3020 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3021 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
|
3022 window_row->glyphs[area] = frame_row->glyphs[area]; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3023 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3024 ++window_row, ++frame_row; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3025 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3026 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3027 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3028 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3029 /* 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
|
3030 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
|
3031 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3032 struct window * |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3033 frame_row_to_window (w, row) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3034 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3035 int row; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3036 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3037 struct window *found = NULL; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3038 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3039 while (w && !found) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3040 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3041 if (!NILP (w->hchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3042 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
|
3043 else if (!NILP (w->vchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3044 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
|
3045 else if (row >= XFASTINT (w->top) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3046 && row < XFASTINT (w->top) + XFASTINT (w->height)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3047 found = w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3048 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3049 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3050 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3051 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3052 return found; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3053 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3054 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3055 |
25012 | 3056 /* Perform a line dance in the window tree rooted at W, after |
3057 scrolling a frame matrix in mirrored_line_dance. | |
3058 | |
3059 We are working on the range of lines UNCHANGED_AT_TOP + 1 to | |
3060 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix. | |
3061 COPY_FROM is a vector containing, for each row I in the range 0 <= | |
3062 I < NLINES, the index of the original line to move to I. This | |
3063 index is relative to the row range, i.e. 0 <= index < NLINES. | |
3064 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES | |
3065 which is empty. */ | |
3066 | |
3067 static void | |
3068 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) | |
3069 struct window *w; | |
3070 int unchanged_at_top, nlines; | |
3071 int *copy_from; | |
3072 char *retained_p; | |
3073 { | |
3074 while (w) | |
3075 { | |
3076 if (!NILP (w->hchild)) | |
3077 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top, | |
3078 nlines, copy_from, retained_p); | |
3079 else if (!NILP (w->vchild)) | |
3080 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top, | |
3081 nlines, copy_from, retained_p); | |
3082 else | |
3083 { | |
3084 /* W is a leaf window, and we are working on its current | |
3085 matrix m. */ | |
3086 struct glyph_matrix *m = w->current_matrix; | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3087 int i, sync_p = 0; |
25012 | 3088 struct glyph_row *old_rows; |
3089 | |
3090 /* Make a copy of the original rows of matrix m. */ | |
3091 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows); | |
3092 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows); | |
3093 | |
3094 for (i = 0; i < nlines; ++i) | |
3095 { | |
3096 /* Frame relative line assigned to. */ | |
3097 int frame_to = i + unchanged_at_top; | |
3098 | |
3099 /* Frame relative line assigned. */ | |
3100 int frame_from = copy_from[i] + unchanged_at_top; | |
3101 | |
3102 /* Window relative line assigned to. */ | |
3103 int window_to = frame_to - m->matrix_y; | |
3104 | |
3105 /* Window relative line assigned. */ | |
3106 int window_from = frame_from - m->matrix_y; | |
3107 | |
3108 /* Is assigned line inside window? */ | |
3109 int from_inside_window_p | |
3110 = window_from >= 0 && window_from < m->matrix_h; | |
3111 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3112 /* Is assigned to line inside window? */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3113 int to_inside_window_p |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3114 = window_to >= 0 && window_to < m->matrix_h; |
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 (from_inside_window_p && to_inside_window_p) |
25012 | 3117 { |
3118 /* Enabled setting before assignment. */ | |
3119 int enabled_before_p; | |
3120 | |
3121 /* Do the assignment. The enabled_p flag is saved | |
3122 over the assignment because the old redisplay did | |
3123 that. */ | |
3124 enabled_before_p = m->rows[window_to].enabled_p; | |
3125 m->rows[window_to] = old_rows[window_from]; | |
3126 m->rows[window_to].enabled_p = enabled_before_p; | |
3127 | |
3128 /* If frame line is empty, window line is empty, too. */ | |
3129 if (!retained_p[copy_from[i]]) | |
3130 m->rows[window_to].enabled_p = 0; | |
3131 } | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3132 else if (to_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3133 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3134 /* A copy between windows. This is an infrequent |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3135 case not worth optimizing. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3136 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3137 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3138 struct window *w2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3139 struct glyph_matrix *m2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3140 int m2_from; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3141 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3142 w2 = frame_row_to_window (root, frame_to); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3143 m2 = w2->current_matrix; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3144 m2_from = frame_from - m2->matrix_y; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3145 copy_row_except_pointers (m->rows + window_to, |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3146 m2->rows + m2_from); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3147 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3148 /* 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
|
3149 if (!retained_p[copy_from[i]]) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3150 m->rows[window_to].enabled_p = 0; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3151 sync_p = 1; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3152 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3153 else if (from_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3154 sync_p = 1; |
25012 | 3155 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3156 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3157 /* 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
|
3158 pointers are in sync with the frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3159 if (sync_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3160 sync_window_with_frame_matrix_rows (w); |
25012 | 3161 |
3162 /* Check that no pointers are lost. */ | |
3163 CHECK_MATRIX (m); | |
3164 } | |
3165 | |
3166 /* Next window on same level. */ | |
3167 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3168 } | |
3169 } | |
3170 | |
3171 | |
3172 #if GLYPH_DEBUG | |
3173 | |
3174 /* Check that window and frame matrices agree about their | |
3175 understanding where glyphs of the rows are to find. For each | |
3176 window in the window tree rooted at W, check that rows in the | |
3177 matrices of leaf window agree with their frame matrices about | |
3178 glyph pointers. */ | |
314 | 3179 |
21514 | 3180 void |
25012 | 3181 check_window_matrix_pointers (w) |
314 | 3182 struct window *w; |
3183 { | |
25012 | 3184 while (w) |
3185 { | |
3186 if (!NILP (w->hchild)) | |
3187 check_window_matrix_pointers (XWINDOW (w->hchild)); | |
3188 else if (!NILP (w->vchild)) | |
3189 check_window_matrix_pointers (XWINDOW (w->vchild)); | |
3190 else | |
3191 { | |
3192 struct frame *f = XFRAME (w->frame); | |
3193 check_matrix_pointers (w->desired_matrix, f->desired_matrix); | |
3194 check_matrix_pointers (w->current_matrix, f->current_matrix); | |
3195 } | |
3196 | |
3197 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3198 } | |
3199 } | |
3200 | |
3201 | |
3202 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is | |
3203 a window and FRAME_MATRIX is the corresponding frame matrix. For | |
3204 each row in WINDOW_MATRIX check that it's a slice of the | |
3205 corresponding frame row. If it isn't, abort. */ | |
3206 | |
3207 static void | |
3208 check_matrix_pointers (window_matrix, frame_matrix) | |
3209 struct glyph_matrix *window_matrix, *frame_matrix; | |
3210 { | |
3211 /* Row number in WINDOW_MATRIX. */ | |
3212 int i = 0; | |
3213 | |
3214 /* Row number corresponding to I in FRAME_MATRIX. */ | |
3215 int j = window_matrix->matrix_y; | |
3216 | |
3217 /* For all rows check that the row in the window matrix is a | |
3218 slice of the row in the frame matrix. If it isn't we didn't | |
3219 mirror an operation on the frame matrix correctly. */ | |
3220 while (i < window_matrix->nrows) | |
3221 { | |
3222 if (!glyph_row_slice_p (window_matrix->rows + i, | |
3223 frame_matrix->rows + j)) | |
3224 abort (); | |
3225 ++i, ++j; | |
3226 } | |
3227 } | |
3228 | |
3229 #endif /* GLYPH_DEBUG != 0 */ | |
3230 | |
3231 | |
3232 | |
3233 /********************************************************************** | |
3234 VPOS and HPOS translations | |
3235 **********************************************************************/ | |
3236 | |
3237 #if GLYPH_DEBUG | |
3238 | |
3239 /* Translate vertical position VPOS which is relative to window W to a | |
3240 vertical position relative to W's frame. */ | |
3241 | |
3242 static int | |
3243 window_to_frame_vpos (w, vpos) | |
3244 struct window *w; | |
3245 int vpos; | |
3246 { | |
3247 struct frame *f = XFRAME (w->frame); | |
3248 | |
3249 xassert (!FRAME_WINDOW_P (f)); | |
3250 xassert (vpos >= 0 && vpos <= w->desired_matrix->nrows); | |
3251 vpos += XFASTINT (w->top); | |
3252 xassert (vpos >= 0 && vpos <= FRAME_HEIGHT (f)); | |
3253 return vpos; | |
3254 } | |
3255 | |
3256 | |
3257 /* Translate horizontal position HPOS which is relative to window W to | |
3258 a vertical position relative to W's frame. */ | |
3259 | |
3260 static int | |
3261 window_to_frame_hpos (w, hpos) | |
3262 struct window *w; | |
3263 int hpos; | |
3264 { | |
3265 struct frame *f = XFRAME (w->frame); | |
3266 | |
3267 xassert (!FRAME_WINDOW_P (f)); | |
3268 hpos += XFASTINT (w->left); | |
3269 return hpos; | |
314 | 3270 } |
25012 | 3271 |
3272 #endif /* GLYPH_DEBUG */ | |
3273 | |
3274 | |
314 | 3275 |
25012 | 3276 /********************************************************************** |
3277 Redrawing Frames | |
3278 **********************************************************************/ | |
3279 | |
3280 DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0, | |
3281 "Clear frame FRAME and output again what is supposed to appear on it.") | |
3282 (frame) | |
3283 Lisp_Object frame; | |
3284 { | |
3285 struct frame *f; | |
3286 | |
3287 CHECK_LIVE_FRAME (frame, 0); | |
3288 f = XFRAME (frame); | |
3289 | |
3290 /* Ignore redraw requests, if frame has no glyphs yet. | |
3291 (Implementation note: It still has to be checked why we are | |
3292 called so early here). */ | |
3293 if (!glyphs_initialized_initially_p) | |
3294 return Qnil; | |
3295 | |
3296 update_begin (f); | |
35445
9af454aee182
(Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents:
35374
diff
changeset
|
3297 if (FRAME_MSDOS_P (f)) |
25012 | 3298 set_terminal_modes (); |
3299 clear_frame (); | |
3300 clear_current_matrices (f); | |
3301 update_end (f); | |
3302 fflush (stdout); | |
3303 windows_or_buffers_changed++; | |
3304 /* Mark all windows as inaccurate, so that every window will have | |
3305 its redisplay done. */ | |
3306 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0); | |
3307 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
3308 f->garbaged = 0; | |
3309 return Qnil; | |
3310 } | |
3311 | |
3312 | |
3313 /* Redraw frame F. This is nothing more than a call to the Lisp | |
3314 function redraw-frame. */ | |
3315 | |
3316 void | |
3317 redraw_frame (f) | |
3318 struct frame *f; | |
3319 { | |
3320 Lisp_Object frame; | |
3321 XSETFRAME (frame, f); | |
3322 Fredraw_frame (frame); | |
3323 } | |
3324 | |
3325 | |
3326 DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "", | |
3327 "Clear and redisplay all visible frames.") | |
3328 () | |
3329 { | |
3330 Lisp_Object tail, frame; | |
3331 | |
3332 FOR_EACH_FRAME (tail, frame) | |
3333 if (FRAME_VISIBLE_P (XFRAME (frame))) | |
3334 Fredraw_frame (frame); | |
3335 | |
3336 return Qnil; | |
3337 } | |
3338 | |
3339 | |
3340 /* This is used when frame_garbaged is set. Call Fredraw_frame on all | |
3341 visible frames marked as garbaged. */ | |
3342 | |
3343 void | |
3344 redraw_garbaged_frames () | |
3345 { | |
3346 Lisp_Object tail, frame; | |
3347 | |
3348 FOR_EACH_FRAME (tail, frame) | |
3349 if (FRAME_VISIBLE_P (XFRAME (frame)) | |
3350 && FRAME_GARBAGED_P (XFRAME (frame))) | |
3351 Fredraw_frame (frame); | |
3352 } | |
3353 | |
3354 | |
3355 | |
3356 /*********************************************************************** | |
3357 Direct Operations | |
3358 ***********************************************************************/ | |
3359 | |
3360 /* Try to update display and current glyph matrix directly. | |
3361 | |
3362 This function is called after a character G has been inserted into | |
3363 current_buffer. It tries to update the current glyph matrix and | |
3364 perform appropriate screen output to reflect the insertion. If it | |
3365 succeeds, the global flag redisplay_performed_directly_p will be | |
3366 set to 1, and thereby prevent the more costly general redisplay | |
3367 from running (see redisplay_internal). | |
3368 | |
3369 This function is not called for `hairy' character insertions. | |
3370 In particular, it is not called when after or before change | |
3371 functions exist, like they are used by font-lock. See keyboard.c | |
3372 for details where this function is called. */ | |
314 | 3373 |
3374 int | |
3375 direct_output_for_insert (g) | |
3376 int g; | |
3377 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3378 register struct frame *f = SELECTED_FRAME (); |
25012 | 3379 struct window *w = XWINDOW (selected_window); |
3380 struct it it, it2; | |
3381 struct glyph_row *glyph_row; | |
3382 struct glyph *glyphs, *glyph, *end; | |
3383 int n; | |
3384 /* Non-null means that Redisplay of W is based on window matrices. */ | |
3385 int window_redisplay_p = FRAME_WINDOW_P (f); | |
3386 /* Non-null means we are in overwrite mode. */ | |
3387 int overwrite_p = !NILP (current_buffer->overwrite_mode); | |
3388 int added_width; | |
3389 struct text_pos pos; | |
3390 int delta, delta_bytes; | |
3391 | |
3392 /* Not done directly. */ | |
3393 redisplay_performed_directly_p = 0; | |
3394 | |
3395 /* Quickly give up for some common cases. */ | |
3396 if (cursor_in_echo_area | |
3397 /* Give up if fonts have changed. */ | |
3398 || fonts_changed_p | |
3399 /* Give up if face attributes have been changed. */ | |
3400 || face_change_count | |
3401 /* Give up if cursor position not really known. */ | |
314 | 3402 || !display_completed |
25012 | 3403 /* Give up if buffer appears in two places. */ |
314 | 3404 || buffer_shared > 1 |
34715
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3405 /* 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
|
3406 minibuffer contents. */ |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3407 || (EQ (selected_window, minibuf_window) |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3408 && EQ (minibuf_window, echo_area_window)) |
25012 | 3409 /* Give up for hscrolled mini-buffer because display of the prompt |
3410 is handled specially there (see display_line). */ | |
3411 || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll)) | |
3412 /* Give up if overwriting in the middle of a line. */ | |
3413 || (overwrite_p | |
3414 && PT != ZV | |
3415 && FETCH_BYTE (PT) != '\n') | |
3416 /* Give up for tabs and line ends. */ | |
3417 || g == '\t' | |
3418 || g == '\n' | |
3419 || g == '\r' | |
3420 /* Give up if unable to display the cursor in the window. */ | |
3421 || w->cursor.vpos < 0 | |
36279
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3422 /* Give up if we are showing a message or just cleared the message |
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3423 because we might need to resize the echo area window. */ |
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3424 || !NILP (echo_area_buffer[0]) |
1e3dc8692936
(direct_output_for_insert): Give up if we are showing
Gerd Moellmann <gerd@gnu.org>
parents:
36115
diff
changeset
|
3425 || !NILP (echo_area_buffer[1]) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3426 || (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
|
3427 /* 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
|
3428 lines would change. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3429 (glyph_row->continued_p |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3430 /* 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
|
3431 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
|
3432 have to be redisplayed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3433 || glyph_row->overlapping_p |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3434 || glyph_row->overlapped_p)) |
25012 | 3435 /* Can't do it for partial width windows on terminal frames |
3436 because we can't clear to eol in such a window. */ | |
3437 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w))) | |
3438 return 0; | |
3439 | |
35374
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3440 /* If we can't insert glyphs, we can use this method only |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3441 at the end of a line. */ |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3442 if (!char_ins_del_ok) |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3443 if (PT != ZV && FETCH_BYTE (PT_BYTE) != '\n') |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3444 return 0; |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3445 |
25012 | 3446 /* Set up a display iterator structure for W. Glyphs will be |
3447 produced in scratch_glyph_row. Current position is W's cursor | |
3448 position. */ | |
3449 clear_glyph_row (&scratch_glyph_row); | |
3450 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
|
3451 DEC_TEXT_POS (pos, !NILP (current_buffer->enable_multibyte_characters)); |
25012 | 3452 init_iterator (&it, w, CHARPOS (pos), BYTEPOS (pos), &scratch_glyph_row, |
3453 DEFAULT_FACE_ID); | |
3454 | |
3455 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
|
3456 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
|
3457 return 0; |
25012 | 3458 |
3459 /* Give up if highlighting trailing whitespace and we have trailing | |
3460 whitespace in glyph_row. We would have to remove the trailing | |
3461 whitespace face in that case. */ | |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3462 if (!NILP (Vshow_trailing_whitespace) |
25012 | 3463 && glyph_row->used[TEXT_AREA]) |
3464 { | |
3465 struct glyph *last; | |
3466 | |
3467 last = glyph_row->glyphs[TEXT_AREA] + glyph_row->used[TEXT_AREA] - 1; | |
3468 if (last->type == STRETCH_GLYPH | |
3469 || (last->type == CHAR_GLYPH | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
3470 && last->u.ch == ' ')) |
25012 | 3471 return 0; |
3472 } | |
3473 | |
3474 /* Give up if there are overlay strings at pos. This would fail | |
3475 if the overlay string has newlines in it. */ | |
3476 if (STRINGP (it.string)) | |
3477 return 0; | |
3478 | |
3479 it.hpos = w->cursor.hpos; | |
3480 it.vpos = w->cursor.vpos; | |
3481 it.current_x = w->cursor.x + it.first_visible_x; | |
3482 it.current_y = w->cursor.y; | |
3483 it.end_charpos = PT; | |
3484 it.stop_charpos = min (PT, it.stop_charpos); | |
3485 | |
3486 /* More than one display element may be returned for PT - 1 if | |
3487 (i) it's a control character which is translated into `\003' or | |
3488 `^C', or (ii) it has a display table entry, or (iii) it's a | |
3489 combination of both. */ | |
3490 delta = delta_bytes = 0; | |
3491 while (get_next_display_element (&it)) | |
3492 { | |
3493 PRODUCE_GLYPHS (&it); | |
3494 | |
3495 /* Give up if glyph doesn't fit completely on the line. */ | |
3496 if (it.current_x >= it.last_visible_x) | |
3497 return 0; | |
3498 | |
3499 /* Give up if new glyph has different ascent or descent than | |
3500 the original row, or if it is not a character glyph. */ | |
3501 if (glyph_row->ascent != it.ascent | |
3502 || 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
|
3503 || glyph_row->phys_ascent != it.phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3504 || glyph_row->phys_height != it.phys_ascent + it.phys_descent |
25012 | 3505 || it.what != IT_CHARACTER) |
3506 return 0; | |
3507 | |
3508 delta += 1; | |
3509 delta_bytes += it.len; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3510 set_iterator_to_next (&it, 1); |
25012 | 3511 } |
3512 | |
3513 /* Give up if we hit the right edge of the window. We would have | |
3514 to insert truncation or continuation glyphs. */ | |
3515 added_width = it.current_x - (w->cursor.x + it.first_visible_x); | |
3516 if (glyph_row->pixel_width + added_width >= it.last_visible_x) | |
314 | 3517 return 0; |
3518 | |
25012 | 3519 /* Give up if there is a \t following in the line. */ |
3520 it2 = it; | |
3521 it2.end_charpos = ZV; | |
3522 it2.stop_charpos = min (it2.stop_charpos, ZV); | |
3523 while (get_next_display_element (&it2) | |
3524 && !ITERATOR_AT_END_OF_LINE_P (&it2)) | |
3525 { | |
3526 if (it2.c == '\t') | |
3527 return 0; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3528 set_iterator_to_next (&it2, 1); |
25012 | 3529 } |
3530 | |
3531 /* Number of new glyphs produced. */ | |
3532 n = it.glyph_row->used[TEXT_AREA]; | |
3533 | |
3534 /* Start and end of glyphs in original row. */ | |
3535 glyphs = glyph_row->glyphs[TEXT_AREA] + w->cursor.hpos; | |
3536 end = glyph_row->glyphs[1 + TEXT_AREA]; | |
3537 | |
3538 /* Make room for new glyphs, then insert them. */ | |
3539 xassert (end - glyphs - n >= 0); | |
25781
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3540 safe_bcopy ((char *) glyphs, (char *) (glyphs + n), |
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3541 (end - glyphs - n) * sizeof (*end)); |
25012 | 3542 bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs); |
3543 glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n, | |
3544 end - glyph_row->glyphs[TEXT_AREA]); | |
3545 | |
3546 /* Compute new line width. */ | |
3547 glyph = glyph_row->glyphs[TEXT_AREA]; | |
3548 end = glyph + glyph_row->used[TEXT_AREA]; | |
3549 glyph_row->pixel_width = glyph_row->x; | |
3550 while (glyph < end) | |
3551 { | |
3552 glyph_row->pixel_width += glyph->pixel_width; | |
3553 ++glyph; | |
3554 } | |
3555 | |
3556 /* Increment buffer positions for glyphs following the newly | |
3557 inserted ones. */ | |
3558 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
|
3559 if (glyph->charpos > 0 && BUFFERP (glyph->object)) |
25012 | 3560 glyph->charpos += delta; |
3561 | |
3562 if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0) | |
3563 { | |
3564 MATRIX_ROW_END_CHARPOS (glyph_row) += delta; | |
3565 MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes; | |
3566 } | |
3567 | |
3568 /* 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
|
3569 increment_matrix_positions (w->current_matrix, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3570 w->cursor.vpos + 1, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3571 w->current_matrix->nrows, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3572 delta, delta_bytes); |
25012 | 3573 |
3574 glyph_row->contains_overlapping_glyphs_p | |
3575 |= it.glyph_row->contains_overlapping_glyphs_p; | |
3576 | |
26591
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3577 glyph_row->displays_text_p = 1; |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3578 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
|
3579 XFASTINT (w->window_end_vpos))); |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3580 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3581 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 3582 highlight_trailing_whitespace (it.f, glyph_row); |
3583 | |
3584 /* Write glyphs. If at end of row, we can simply call write_glyphs. | |
3585 In the middle, we have to insert glyphs. Note that this is now | |
3586 implemented for X frames. The implementation uses updated_window | |
3587 and updated_row. */ | |
3588 updated_row = glyph_row; | |
3589 update_begin (f); | |
3590 if (rif) | |
3591 { | |
3592 rif->update_window_begin_hook (w); | |
3593 | |
36115
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3594 if (glyphs == end - n |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3595 /* In front of a space added by append_space. */ |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3596 || (glyphs == end - n - 1 |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3597 && (end - n)->charpos <= 0)) |
25012 | 3598 rif->write_glyphs (glyphs, n); |
3599 else | |
3600 rif->insert_glyphs (glyphs, n); | |
3601 } | |
3602 else | |
3603 { | |
3604 if (glyphs == end - n) | |
3605 write_glyphs (glyphs, n); | |
3606 else | |
3607 insert_glyphs (glyphs, n); | |
3608 } | |
3609 | |
3610 w->cursor.hpos += n; | |
3611 w->cursor.x = it.current_x - it.first_visible_x; | |
3612 xassert (w->cursor.hpos >= 0 | |
3613 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
3614 | |
3615 /* How to set the cursor differs depending on whether we are | |
3616 using a frame matrix or a window matrix. Note that when | |
3617 a frame matrix is used, cursor_to expects frame coordinates, | |
3618 and the X and Y parameters are not used. */ | |
3619 if (window_redisplay_p) | |
3620 rif->cursor_to (w->cursor.vpos, w->cursor.hpos, | |
3621 w->cursor.y, w->cursor.x); | |
3622 else | |
3623 { | |
3624 int x, y; | |
3625 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos) | |
3626 + (INTEGERP (w->left_margin_width) | |
3627 ? XFASTINT (w->left_margin_width) | |
3628 : 0)); | |
3629 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
3630 cursor_to (y, x); | |
3631 } | |
3632 | |
3633 if (rif) | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3634 rif->update_window_end_hook (w, 1, 0); |
25012 | 3635 update_end (f); |
3636 updated_row = NULL; | |
3637 fflush (stdout); | |
3638 | |
3639 TRACE ((stderr, "direct output for insert\n")); | |
3640 | |
25372
acf281b41a38
(direct_output_for_insert): Set beg_unchanged
Gerd Moellmann <gerd@gnu.org>
parents:
25345
diff
changeset
|
3641 UNCHANGED_MODIFIED = MODIFF; |
acf281b41a38
(direct_output_for_insert): Set beg_unchanged
Gerd Moellmann <gerd@gnu.org>
parents:
25345
diff
changeset
|
3642 BEG_UNCHANGED = GPT - BEG; |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15896
diff
changeset
|
3643 XSETFASTINT (w->last_point, PT); |
25012 | 3644 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
|
3645 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
|
3646 XSETFASTINT (w->last_overlay_modified, OVERLAY_MODIFF); |
314 | 3647 |
25012 | 3648 redisplay_performed_directly_p = 1; |
314 | 3649 return 1; |
3650 } | |
3651 | |
25012 | 3652 |
3653 /* Perform a direct display update for moving PT by N positions | |
3654 left or right. N < 0 means a movement backwards. This function | |
3655 is currently only called for N == 1 or N == -1. */ | |
3656 | |
314 | 3657 int |
3658 direct_output_forward_char (n) | |
3659 int n; | |
3660 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3661 struct frame *f = SELECTED_FRAME (); |
25012 | 3662 struct window *w = XWINDOW (selected_window); |
3663 struct glyph_row *row; | |
3664 | |
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3665 /* 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
|
3666 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
|
3667 current_buffer, PT)) |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3668 return 0; |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3669 |
25012 | 3670 /* Give up if face attributes have been changed. */ |
3671 if (face_change_count) | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
3672 return 0; |
25012 | 3673 |
3674 /* Give up if current matrix is not up to date or we are | |
3675 displaying a message. */ | |
3676 if (!display_completed || cursor_in_echo_area) | |
3677 return 0; | |
3678 | |
3679 /* Give up if the buffer's direction is reversed. */ | |
3680 if (!NILP (XBUFFER (w->buffer)->direction_reversed)) | |
314 | 3681 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
|
3682 |
2794
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3683 /* 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
|
3684 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
|
3685 return 0; |
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3686 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3687 /* Can't use direct output if highlighting trailing whitespace. */ |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3688 if (!NILP (Vshow_trailing_whitespace)) |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3689 return 0; |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3690 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3691 /* 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
|
3692 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
|
3693 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
|
3694 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3695 |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3696 /* 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
|
3697 minibuffer contents. */ |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3698 if (XWINDOW (minibuf_window) == w |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3699 && EQ (minibuf_window, echo_area_window)) |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3700 return 0; |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3701 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3702 /* 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
|
3703 if (w->cursor.vpos < 0) |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3704 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3705 |
25012 | 3706 row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); |
3707 | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
3708 /* Give up if PT is outside of the last known cursor row. */ |
25012 | 3709 if (PT <= MATRIX_ROW_START_BYTEPOS (row) |
3710 || 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
|
3711 return 0; |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
3712 |
25012 | 3713 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
|
3714 |
25012 | 3715 w->last_cursor = w->cursor; |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15896
diff
changeset
|
3716 XSETFASTINT (w->last_point, PT); |
25012 | 3717 |
3718 xassert (w->cursor.hpos >= 0 | |
3719 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
3720 | |
3721 if (FRAME_WINDOW_P (f)) | |
3722 rif->cursor_to (w->cursor.vpos, w->cursor.hpos, | |
3723 w->cursor.y, w->cursor.x); | |
3724 else | |
3725 { | |
3726 int x, y; | |
3727 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos) | |
3728 + (INTEGERP (w->left_margin_width) | |
3729 ? XFASTINT (w->left_margin_width) | |
3730 : 0)); | |
3731 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
3732 cursor_to (y, x); | |
3733 } | |
3734 | |
314 | 3735 fflush (stdout); |
25012 | 3736 redisplay_performed_directly_p = 1; |
314 | 3737 return 1; |
3738 } | |
25012 | 3739 |
3740 | |
314 | 3741 |
25012 | 3742 /*********************************************************************** |
3743 Frame Update | |
3744 ***********************************************************************/ | |
3745 | |
3746 /* Update frame F based on the data in desired matrices. | |
3747 | |
3748 If FORCE_P is non-zero, don't let redisplay be stopped by detecting | |
3749 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try | |
3750 scrolling. | |
3751 | |
3752 Value is non-zero if redisplay was stopped due to pending input. */ | |
314 | 3753 |
3754 int | |
25012 | 3755 update_frame (f, force_p, inhibit_hairy_id_p) |
3756 struct frame *f; | |
3757 int force_p; | |
3758 int inhibit_hairy_id_p; | |
3759 { | |
3760 /* 1 means display has been paused because of pending input. */ | |
3761 int paused_p; | |
3762 struct window *root_window = XWINDOW (f->root_window); | |
3763 | |
3764 if (FRAME_WINDOW_P (f)) | |
3765 { | |
3766 /* We are working on window matrix basis. All windows whose | |
3767 flag must_be_updated_p is set have to be updated. */ | |
3768 | |
3769 /* Record that we are not working on frame matrices. */ | |
3770 set_frame_matrix_frame (NULL); | |
3771 | |
3772 /* Update all windows in the window tree of F, maybe stopping | |
3773 when pending input is detected. */ | |
3774 update_begin (f); | |
3775 | |
3776 /* Update the menu bar on X frames that don't have toolkit | |
3777 support. */ | |
3778 if (WINDOWP (f->menu_bar_window)) | |
3779 update_window (XWINDOW (f->menu_bar_window), 1); | |
3780 | |
3781 /* 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
|
3782 if (WINDOWP (f->tool_bar_window)) |
25012 | 3783 { |
3784 Lisp_Object tem; | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3785 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 3786 |
3787 /* Update tool-bar window. */ | |
3788 if (w->must_be_updated_p) | |
3789 { | |
3790 update_window (w, 1); | |
3791 w->must_be_updated_p = 0; | |
3792 | |
3793 /* Swap tool-bar strings. We swap because we want to | |
3794 reuse strings. */ | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3795 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
|
3796 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
|
3797 f->desired_tool_bar_string = tem; |
25012 | 3798 } |
3799 } | |
3800 | |
3801 | |
3802 /* Update windows. */ | |
3803 paused_p = update_window_tree (root_window, force_p); | |
3804 update_end (f); | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3805 |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3806 #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
|
3807 and it doesn't seem to be necessary anyway. */ |
25012 | 3808 rif->flush_display (f); |
3809 #endif | |
3810 } | |
3811 else | |
3812 { | |
3813 /* We are working on frame matrix basis. Set the frame on whose | |
3814 frame matrix we operate. */ | |
3815 set_frame_matrix_frame (f); | |
3816 | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3817 /* Build F's desired matrix from window matrices. */ |
25012 | 3818 build_frame_matrix (f); |
3819 | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3820 /* Update the display */ |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3821 update_begin (f); |
25012 | 3822 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
|
3823 update_end (f); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3824 |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3825 if (termscript) |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3826 fflush (termscript); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3827 fflush (stdout); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3828 |
25012 | 3829 /* 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
|
3830 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3831 check_window_matrix_pointers (root_window); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3832 add_frame_display_history (f, paused_p); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3833 #endif |
25012 | 3834 } |
3835 | |
3836 /* Reset flags indicating that a window should be updated. */ | |
3837 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
|
3838 |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3839 display_completed = !paused_p; |
25012 | 3840 return paused_p; |
3841 } | |
3842 | |
3843 | |
3844 | |
3845 /************************************************************************ | |
3846 Window-based updates | |
3847 ************************************************************************/ | |
3848 | |
3849 /* Perform updates in window tree rooted at W. FORCE_P non-zero means | |
3850 don't stop updating when input is pending. */ | |
3851 | |
3852 static int | |
3853 update_window_tree (w, force_p) | |
3854 struct window *w; | |
3855 int force_p; | |
3856 { | |
3857 int paused_p = 0; | |
3858 | |
3859 while (w && !paused_p) | |
3860 { | |
3861 if (!NILP (w->hchild)) | |
3862 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p); | |
3863 else if (!NILP (w->vchild)) | |
3864 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p); | |
3865 else if (w->must_be_updated_p) | |
3866 paused_p |= update_window (w, force_p); | |
3867 | |
3868 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3869 } | |
3870 | |
3871 return paused_p; | |
3872 } | |
3873 | |
3874 | |
3875 /* Update window W if its flag must_be_updated_p is non-zero. If | |
3876 FORCE_P is non-zero, don't stop updating if input is pending. */ | |
3877 | |
3878 void | |
3879 update_single_window (w, force_p) | |
3880 struct window *w; | |
3881 int force_p; | |
3882 { | |
3883 if (w->must_be_updated_p) | |
3884 { | |
3885 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
3886 | |
3887 /* Record that this is not a frame-based redisplay. */ | |
3888 set_frame_matrix_frame (NULL); | |
3889 | |
3890 /* Update W. */ | |
3891 update_begin (f); | |
3892 update_window (w, force_p); | |
3893 update_end (f); | |
3894 | |
3895 /* Reset flag in W. */ | |
3896 w->must_be_updated_p = 0; | |
3897 } | |
3898 } | |
3899 | |
3900 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3901 /* 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
|
3902 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
|
3903 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3904 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3905 redraw_overlapped_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3906 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3907 int yb; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3908 { |
30165
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
3909 int i; |
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
3910 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3911 /* 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
|
3912 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
|
3913 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
|
3914 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
|
3915 current rows is 0. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3916 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
|
3917 { |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3918 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
|
3919 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3920 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3921 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3922 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3923 continue; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3924 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3925 if (row->overlapped_p) |
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 enum glyph_row_area area; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3928 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3929 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
|
3930 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3931 updated_row = row; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3932 updated_area = area; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3933 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
|
3934 if (row->used[area]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3935 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
|
3936 rif->clear_end_of_line (-1); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3937 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3938 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3939 row->overlapped_p = 0; |
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 |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3942 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
|
3943 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3944 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3945 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3946 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3947 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3948 /* 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
|
3949 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
|
3950 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3951 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3952 redraw_overlapping_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3953 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3954 int yb; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3955 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3956 int i, bottom_y; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3957 struct glyph_row *row; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3958 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3959 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
|
3960 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3961 row = w->current_matrix->rows + i; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3962 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3963 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3964 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3965 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3966 continue; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3967 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3968 bottom_y = MATRIX_ROW_BOTTOM_Y (row); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3969 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3970 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
|
3971 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3972 if (row->used[LEFT_MARGIN_AREA]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3973 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
|
3974 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3975 if (row->used[TEXT_AREA]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3976 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
|
3977 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3978 if (row->used[RIGHT_MARGIN_AREA]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3979 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
|
3980 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3981 /* 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
|
3982 display. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3983 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
|
3984 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
|
3985 if ((row->phys_height - row->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3986 > row->height - row->ascent) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3987 && bottom_y < yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3988 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
|
3989 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3990 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3991 if (bottom_y >= yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3992 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3993 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3994 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3995 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3996 |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3997 #ifdef GLYPH_DEBUG |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3998 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
3999 /* 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
|
4000 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
|
4001 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4002 void |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4003 check_current_matrix_flags (w) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4004 struct window *w; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4005 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4006 int last_seen_p = 0; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4007 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
|
4008 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4009 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
|
4010 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4011 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
|
4012 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
|
4013 last_seen_p = 1; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4014 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
|
4015 abort (); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4016 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4017 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4018 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4019 #endif /* GLYPH_DEBUG */ |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4020 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4021 |
25012 | 4022 /* Update display of window W. FORCE_P non-zero means that we should |
4023 not stop when detecting pending input. */ | |
4024 | |
4025 static int | |
4026 update_window (w, force_p) | |
4027 struct window *w; | |
4028 int force_p; | |
4029 { | |
4030 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4031 int paused_p; | |
4032 int preempt_count = baud_rate / 2400 + 1; | |
4033 extern int input_pending; | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4034 extern Lisp_Object do_mouse_tracking; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4035 #if GLYPH_DEBUG |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4036 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
25012 | 4037 extern struct frame *updating_frame; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4038 #endif |
25012 | 4039 |
4040 /* Check that W's frame doesn't have glyph matrices. */ | |
4041 xassert (FRAME_WINDOW_P (f)); | |
4042 xassert (updating_frame != NULL); | |
4043 | |
4044 /* Check pending input the first time so that we can quickly return. */ | |
4045 if (redisplay_dont_pause) | |
4046 force_p = 1; | |
4047 else | |
4048 detect_input_pending (); | |
4049 | |
4050 /* If forced to complete the update, or if no input is pending, do | |
4051 the update. */ | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4052 if (force_p || !input_pending || !NILP (do_mouse_tracking)) |
25012 | 4053 { |
4054 struct glyph_row *row, *end; | |
4055 struct glyph_row *mode_line_row; | |
25546 | 4056 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
|
4057 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated; |
25012 | 4058 |
4059 rif->update_window_begin_hook (w); | |
4060 yb = window_text_bottom_y (w); | |
4061 | |
4062 /* If window has a top line, update it before everything else. | |
4063 Adjust y-positions of other rows by the top line height. */ | |
4064 row = desired_matrix->rows; | |
4065 end = row + desired_matrix->nrows - 1; | |
4066 if (row->mode_line_p) | |
25546 | 4067 header_line_row = row++; |
25012 | 4068 |
4069 /* Update the mode line, if necessary. */ | |
4070 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix); | |
4071 if (mode_line_row->mode_line_p && mode_line_row->enabled_p) | |
4072 { | |
4073 mode_line_row->y = yb; | |
4074 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
|
4075 desired_matrix), |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4076 &mouse_face_overwritten_p); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4077 changed_p = 1; |
25012 | 4078 } |
4079 | |
4080 /* Find first enabled row. Optimizations in redisplay_internal | |
4081 may lead to an update with only one row enabled. There may | |
4082 be also completely empty matrices. */ | |
4083 while (row < end && !row->enabled_p) | |
4084 ++row; | |
4085 | |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4086 /* Try reusing part of the display by copying. */ |
25012 | 4087 if (row < end && !desired_matrix->no_scrolling_p) |
4088 { | |
25546 | 4089 int rc = scrolling_window (w, header_line_row != NULL); |
25012 | 4090 if (rc < 0) |
4091 { | |
4092 /* All rows were found to be equal. */ | |
4093 paused_p = 0; | |
4094 goto set_cursor; | |
4095 } | |
4096 else if (rc > 0) | |
4097 force_p = 1; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4098 changed_p = 1; |
25012 | 4099 } |
4100 | |
4101 /* Update the top mode line after scrolling because a new top | |
4102 line would otherwise overwrite lines at the top of the window | |
4103 that can be scrolled. */ | |
25546 | 4104 if (header_line_row && header_line_row->enabled_p) |
25012 | 4105 { |
25546 | 4106 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
|
4107 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
|
4108 changed_p = 1; |
25012 | 4109 } |
4110 | |
4111 /* 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
|
4112 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
|
4113 if (row->enabled_p) |
25012 | 4114 { |
4115 int vpos = MATRIX_ROW_VPOS (row, desired_matrix); | |
4116 int i; | |
4117 | |
4118 /* We'll Have to play a little bit with when to | |
4119 detect_input_pending. If it's done too often, | |
4120 scrolling large windows with repeated scroll-up | |
4121 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
|
4122 if (!force_p && ++n_updated % preempt_count == 0) |
25012 | 4123 detect_input_pending (); |
4124 | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4125 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
|
4126 &mouse_face_overwritten_p); |
25012 | 4127 |
4128 /* Mark all rows below the last visible one in the current | |
4129 matrix as invalid. This is necessary because of | |
4130 variable line heights. Consider the case of three | |
4131 successive redisplays, where the first displays 5 | |
4132 lines, the second 3 lines, and the third 5 lines again. | |
4133 If the second redisplay wouldn't mark rows in the | |
4134 current matrix invalid, the third redisplay might be | |
4135 tempted to optimize redisplay based on lines displayed | |
4136 in the first redisplay. */ | |
4137 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
4138 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i) | |
4139 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
4140 } | |
4141 | |
4142 /* Was display preempted? */ | |
4143 paused_p = row < end; | |
4144 | |
4145 set_cursor: | |
4146 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4147 /* Fix the appearance of overlapping(overlapped rows. */ |
25012 | 4148 if (!paused_p && !w->pseudo_window_p) |
4149 { | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4150 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
|
4151 { |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4152 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
|
4153 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
|
4154 } |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4155 |
25012 | 4156 /* Make cursor visible at cursor position of W. */ |
4157 set_window_cursor_after_update (w); | |
4158 | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4159 #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
|
4160 for debugging only. See the comment of check_matrix_invariants. */ |
25012 | 4161 IF_DEBUG (check_matrix_invariants (w)); |
4162 #endif | |
4163 } | |
4164 | |
4165 #if GLYPH_DEBUG | |
4166 /* Remember the redisplay method used to display the matrix. */ | |
4167 strcpy (w->current_matrix->method, w->desired_matrix->method); | |
4168 #endif | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4169 |
25012 | 4170 /* 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
|
4171 rif->update_window_end_hook (w, 1, mouse_face_overwritten_p); |
25012 | 4172 } |
4173 else | |
4174 paused_p = 1; | |
4175 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
4176 #if GLYPH_DEBUG |
34944
4fc804373f2a
(update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents:
34929
diff
changeset
|
4177 /* check_current_matrix_flags (w); */ |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4178 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
|
4179 #endif |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4180 |
25012 | 4181 clear_glyph_matrix (desired_matrix); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4182 |
25012 | 4183 return paused_p; |
4184 } | |
4185 | |
4186 | |
4187 /* Update the display of area AREA in window W, row number VPOS. | |
4188 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */ | |
4189 | |
4190 static void | |
4191 update_marginal_area (w, area, vpos) | |
4192 struct window *w; | |
4193 int area, vpos; | |
4194 { | |
4195 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
4196 | |
4197 /* Let functions in xterm.c know what area subsequent X positions | |
4198 will be relative to. */ | |
4199 updated_area = area; | |
4200 | |
4201 /* Set cursor to start of glyphs, write them, and clear to the end | |
4202 of the area. I don't think that something more sophisticated is | |
4203 necessary here, since marginal areas will not be the default. */ | |
4204 rif->cursor_to (vpos, 0, desired_row->y, 0); | |
4205 if (desired_row->used[area]) | |
4206 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]); | |
4207 rif->clear_end_of_line (-1); | |
4208 } | |
4209 | |
4210 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4211 /* 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
|
4212 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
|
4213 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4214 static int |
25012 | 4215 update_text_area (w, vpos) |
4216 struct window *w; | |
4217 int vpos; | |
314 | 4218 { |
25012 | 4219 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); |
4220 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
|
4221 int changed_p = 0; |
25012 | 4222 |
4223 /* Let functions in xterm.c know what area subsequent X positions | |
4224 will be relative to. */ | |
4225 updated_area = TEXT_AREA; | |
4226 | |
4227 /* If rows are at different X or Y, or rows have different height, | |
4228 or the current row is marked invalid, write the entire line. */ | |
4229 if (!current_row->enabled_p | |
4230 || desired_row->y != current_row->y | |
4231 || desired_row->ascent != current_row->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4232 || 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
|
4233 || desired_row->phys_height != current_row->phys_height |
25012 | 4234 || 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
|
4235 || current_row->overlapped_p |
30307
faf4e303bab7
(update_text_area): Write the whole row if it
Gerd Moellmann <gerd@gnu.org>
parents:
30165
diff
changeset
|
4236 || current_row->mouse_face_p |
25012 | 4237 || current_row->x != desired_row->x) |
4238 { | |
4239 rif->cursor_to (vpos, 0, desired_row->y, desired_row->x); | |
4240 | |
4241 if (desired_row->used[TEXT_AREA]) | |
4242 rif->write_glyphs (desired_row->glyphs[TEXT_AREA], | |
4243 desired_row->used[TEXT_AREA]); | |
4244 | |
4245 /* Clear to end of window. */ | |
4246 rif->clear_end_of_line (-1); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4247 changed_p = 1; |
25012 | 4248 } |
4249 else | |
4250 { | |
4251 int stop, i, x; | |
4252 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; | |
4253 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
|
4254 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
|
4255 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
|
4256 |
25012 | 4257 /* If the desired row extends its face to the text area end, |
4258 make sure we write at least one glyph, so that the face | |
4259 extension actually takes place. */ | |
35269 | 4260 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
|
4261 --desired_stop_pos; |
25012 | 4262 |
4263 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); | |
4264 i = 0; | |
4265 x = desired_row->x; | |
36097
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4266 |
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4267 /* Loop over glyphs that current and desired row may have |
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4268 in common. */ |
25012 | 4269 while (i < stop) |
4270 { | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4271 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
|
4272 |
25012 | 4273 /* 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
|
4274 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
|
4275 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
|
4276 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
|
4277 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
|
4278 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
|
4279 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
|
4280 `f' on the screen. */ |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4281 if (overlapping_glyphs_p && i > 0) |
25012 | 4282 { |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4283 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
|
4284 int left, right; |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4285 |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4286 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
|
4287 &left, &right); |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4288 can_skip_p = right == 0; |
25012 | 4289 } |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4290 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4291 if (can_skip_p) |
25012 | 4292 { |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4293 while (i < stop |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4294 && GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4295 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4296 x += desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4297 ++desired_glyph, ++current_glyph, ++i; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4298 } |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4299 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4300 /* 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
|
4301 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
|
4302 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
|
4303 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
|
4304 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
|
4305 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
|
4306 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
|
4307 taken care of by x_draw_glyphs. */ |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4308 if (overlapping_glyphs_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4309 && i > 0 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4310 && i < current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4311 && (current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4312 != desired_row->used[TEXT_AREA])) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4313 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4314 int left, right; |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4315 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4316 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
|
4317 &left, &right); |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4318 while (left > 0 && i > 0) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4319 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4320 --i, --desired_glyph, --current_glyph; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4321 x -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4322 left -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4323 } |
25012 | 4324 } |
4325 } | |
4326 | |
4327 /* Try to avoid writing the entire rest of the desired row | |
4328 by looking for a resync point. This mainly prevents | |
4329 mode line flickering in the case the mode line is in | |
4330 fixed-pitch font, which it usually will be. */ | |
4331 if (i < desired_row->used[TEXT_AREA]) | |
4332 { | |
4333 int start_x = x, start_hpos = i; | |
4334 struct glyph *start = desired_glyph; | |
4335 int current_x = x; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4336 int skip_first_p = !can_skip_p; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4337 |
25012 | 4338 /* Find the next glyph that's equal again. */ |
4339 while (i < stop | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4340 && (skip_first_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4341 || !GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
25012 | 4342 && x == current_x) |
4343 { | |
4344 x += desired_glyph->pixel_width; | |
4345 current_x += current_glyph->pixel_width; | |
4346 ++desired_glyph, ++current_glyph, ++i; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4347 skip_first_p = 0; |
25012 | 4348 } |
4349 | |
4350 if (i == start_hpos || x != current_x) | |
4351 { | |
4352 i = start_hpos; | |
4353 x = start_x; | |
4354 desired_glyph = start; | |
4355 break; | |
4356 } | |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4357 |
25012 | 4358 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x); |
4359 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
|
4360 changed_p = 1; |
25012 | 4361 } |
4362 } | |
4363 | |
4364 /* Write the rest. */ | |
4365 if (i < desired_row->used[TEXT_AREA]) | |
4366 { | |
4367 rif->cursor_to (vpos, i, desired_row->y, x); | |
4368 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
|
4369 changed_p = 1; |
25012 | 4370 } |
4371 | |
4372 /* Maybe clear to end of line. */ | |
4373 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) | |
4374 { | |
4375 /* If new row extends to the end of the text area, nothing | |
4376 has to be cleared, if and only if we did a write_glyphs | |
4377 above. This is made sure by setting desired_stop_pos | |
4378 appropriately above. */ | |
4379 xassert (i < desired_row->used[TEXT_AREA]); | |
4380 } | |
4381 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) | |
4382 { | |
4383 /* If old row extends to the end of the text area, clear. */ | |
4384 if (i >= desired_row->used[TEXT_AREA]) | |
4385 rif->cursor_to (vpos, i, desired_row->y, | |
4386 desired_row->x + desired_row->pixel_width); | |
4387 rif->clear_end_of_line (-1); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4388 changed_p = 1; |
25012 | 4389 } |
4390 else if (desired_row->pixel_width < current_row->pixel_width) | |
4391 { | |
4392 /* Otherwise clear to the end of the old row. Everything | |
4393 after that position should be clear already. */ | |
4394 int x; | |
4395 | |
4396 if (i >= desired_row->used[TEXT_AREA]) | |
4397 rif->cursor_to (vpos, i, desired_row->y, | |
4398 desired_row->x + desired_row->pixel_width); | |
4399 | |
4400 /* If cursor is displayed at the end of the line, make sure | |
4401 it's cleared. Nowadays we don't have a phys_cursor_glyph | |
4402 with which to erase the cursor (because this method | |
4403 doesn't work with lbearing/rbearing), so we must do it | |
4404 this way. */ | |
4405 if (vpos == w->phys_cursor.vpos | |
4406 && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA]) | |
4407 { | |
4408 w->phys_cursor_on_p = 0; | |
4409 x = -1; | |
4410 } | |
4411 else | |
4412 x = current_row->x + current_row->pixel_width; | |
4413 rif->clear_end_of_line (x); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4414 changed_p = 1; |
25012 | 4415 } |
4416 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4417 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4418 return changed_p; |
25012 | 4419 } |
4420 | |
4421 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4422 /* 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
|
4423 changed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4424 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4425 static int |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4426 update_window_line (w, vpos, mouse_face_overwritten_p) |
25012 | 4427 struct window *w; |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4428 int vpos, *mouse_face_overwritten_p; |
25012 | 4429 { |
4430 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); | |
4431 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
|
4432 int changed_p = 0; |
25012 | 4433 |
4434 /* Set the row being updated. This is important to let xterm.c | |
4435 know what line height values are in effect. */ | |
4436 updated_row = desired_row; | |
4437 | |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4438 /* 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
|
4439 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
|
4440 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
|
4441 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
|
4442 if (desired_row->mode_line_p |
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4443 || desired_row->visible_height > 0) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4444 { |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4445 xassert (desired_row->enabled_p); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4446 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4447 /* 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
|
4448 if (!desired_row->full_width_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4449 && !NILP (w->left_margin_width)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4450 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4451 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4452 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
|
4453 } |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4454 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4455 /* Update the display of the text area. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4456 if (update_text_area (w, vpos)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4457 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4458 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4459 if (current_row->mouse_face_p) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4460 *mouse_face_overwritten_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4461 } |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4462 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4463 /* 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
|
4464 if (!desired_row->full_width_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4465 && !NILP (w->right_margin_width)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4466 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4467 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4468 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
|
4469 } |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4470 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4471 /* Draw truncation marks etc. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4472 if (!current_row->enabled_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4473 || desired_row->y != current_row->y |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4474 || 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
|
4475 || 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
|
4476 || 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
|
4477 || 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
|
4478 || 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
|
4479 || 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
|
4480 || (desired_row->indicate_empty_line_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4481 != current_row->indicate_empty_line_p) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4482 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4483 != MATRIX_ROW_CONTINUATION_LINE_P (current_row))) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4484 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
|
4485 } |
25012 | 4486 |
4487 /* Update current_row from desired_row. */ | |
4488 make_current (w->desired_matrix, w->current_matrix, vpos); | |
4489 updated_row = NULL; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4490 return changed_p; |
25012 | 4491 } |
4492 | |
4493 | |
4494 /* Set the cursor after an update of window W. This function may only | |
4495 be called from update_window. */ | |
4496 | |
4497 static void | |
4498 set_window_cursor_after_update (w) | |
4499 struct window *w; | |
4500 { | |
4501 struct frame *f = XFRAME (w->frame); | |
4502 int cx, cy, vpos, hpos; | |
4503 | |
4504 /* Not intended for frame matrix updates. */ | |
4505 xassert (FRAME_WINDOW_P (f)); | |
4506 | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4507 if (cursor_in_echo_area |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4508 && !NILP (echo_area_buffer[0]) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4509 /* 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
|
4510 show the cursor for the message instead. */ |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4511 && XWINDOW (minibuf_window) == w |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4512 && EQ (minibuf_window, echo_area_window) |
25012 | 4513 /* These cases apply only to the frame that contains |
4514 the active mini-buffer window. */ | |
4515 && FRAME_HAS_MINIBUF_P (f) | |
4516 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) | |
4517 { | |
4518 cx = cy = vpos = hpos = 0; | |
4519 | |
4520 if (cursor_in_echo_area >= 0) | |
4521 { | |
4522 /* If the mini-buffer is several lines high, find the last | |
4523 line that has any text on it. Note: either all lines | |
4524 are enabled or none. Otherwise we wouldn't be able to | |
4525 determine Y. */ | |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4526 struct glyph_row *row, *last_row; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4527 struct glyph *glyph; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4528 int yb = window_text_bottom_y (w); |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4529 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4530 last_row = NULL; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4531 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
|
4532 row->enabled_p; |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4533 ++row) |
25012 | 4534 { |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4535 if (row->used[TEXT_AREA] |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4536 && row->glyphs[TEXT_AREA][0].charpos >= 0) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4537 last_row = row; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4538 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4539 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4540 break; |
25012 | 4541 } |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4542 |
25012 | 4543 if (last_row) |
4544 { | |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4545 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
|
4546 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
|
4547 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4548 while (last > start && last->charpos < 0) |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4549 --last; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4550 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4551 for (glyph = start; glyph < last; ++glyph) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4552 { |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4553 cx += glyph->pixel_width; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4554 ++hpos; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4555 } |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4556 |
25012 | 4557 cy = last_row->y; |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4558 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix); |
25012 | 4559 } |
4560 } | |
4561 } | |
4562 else | |
4563 { | |
4564 cx = w->cursor.x; | |
4565 cy = w->cursor.y; | |
4566 hpos = w->cursor.hpos; | |
4567 vpos = w->cursor.vpos; | |
4568 } | |
4569 | |
4570 /* Window cursor can be out of sync for horizontally split windows. */ | |
4571 hpos = max (0, hpos); | |
4572 hpos = min (w->current_matrix->matrix_w - 1, hpos); | |
4573 vpos = max (0, vpos); | |
4574 vpos = min (w->current_matrix->nrows - 1, vpos); | |
4575 rif->cursor_to (vpos, hpos, cy, cx); | |
4576 } | |
4577 | |
4578 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4579 /* 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
|
4580 tree rooted at W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4581 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4582 void |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4583 set_window_update_flags (w, on_p) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4584 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4585 int on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4586 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4587 while (w) |
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 if (!NILP (w->hchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4590 set_window_update_flags (XWINDOW (w->hchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4591 else if (!NILP (w->vchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4592 set_window_update_flags (XWINDOW (w->vchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4593 else |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4594 w->must_be_updated_p = on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4595 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4596 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
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 } |
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 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4601 |
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 Window-Based 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 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4606 /* Structure describing rows in scrolling_window. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4607 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4608 struct row_entry |
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 /* 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
|
4611 int old_uses, new_uses; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4612 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4613 /* Vpos of row in new matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4614 int new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4615 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4616 /* 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
|
4617 int bucket; |
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 /* The row described by this entry. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4620 struct glyph_row *row; |
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 /* Hash collision chain. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4623 struct row_entry *next; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4624 }; |
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 /* 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
|
4627 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
|
4628 that we need a larger one. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4629 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4630 static struct row_entry *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4631 static int row_entry_pool_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4632 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4633 /* Index of next free entry in row_entry_pool. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4634 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4635 static int row_entry_idx; |
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 /* 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
|
4638 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
|
4639 current matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4640 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4641 static struct row_entry **row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4642 static int row_table_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4643 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4644 /* 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
|
4645 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
|
4646 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4647 static struct row_entry **old_lines, **new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4648 static int old_lines_size, new_lines_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4649 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4650 /* 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
|
4651 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4652 static struct run *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4653 static int runs_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4654 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4655 /* A vector of runs of lines found during scrolling. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4656 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4657 static struct run **runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4658 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4659 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
|
4660 struct glyph_row *)); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4661 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4662 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4663 /* 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
|
4664 of window W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4665 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4666 static INLINE struct row_entry * |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4667 add_row_entry (w, row) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4668 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4669 struct glyph_row *row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4670 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4671 struct row_entry *entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4672 int i = row->hash % row_table_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4673 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4674 entry = row_table[i]; |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
4675 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
|
4676 entry = entry->next; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4677 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4678 if (entry == NULL) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4679 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4680 entry = row_entry_pool + row_entry_idx++; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4681 entry->row = row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4682 entry->old_uses = entry->new_uses = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4683 entry->new_line_number = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4684 entry->bucket = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4685 entry->next = row_table[i]; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4686 row_table[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4687 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4688 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4689 return entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4690 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4691 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4692 |
25012 | 4693 /* Try to reuse part of the current display of W by scrolling lines. |
25546 | 4694 HEADER_LINE_P non-zero means W has a top mode line. |
25012 | 4695 |
4696 The algorithm is taken from Communications of the ACM, Apr78 "A | |
4697 Technique for Isolating Differences Between Files." It should take | |
4698 O(N) time. | |
4699 | |
4700 A short outline of the steps of the algorithm | |
4701 | |
4702 1. Skip lines equal at the start and end of both matrices. | |
4703 | |
4704 2. Enter rows in the current and desired matrix into a symbol | |
4705 table, counting how often they appear in both matrices. | |
4706 | |
4707 3. Rows that appear exactly once in both matrices serve as anchors, | |
4708 i.e. we assume that such lines are likely to have been moved. | |
4709 | |
4710 4. Starting from anchor lines, extend regions to be scrolled both | |
4711 forward and backward. | |
4712 | |
4713 Value is | |
4714 | |
4715 -1 if all rows were found to be equal. | |
4716 0 to indicate that we did not scroll the display, or | |
4717 1 if we did scroll. */ | |
4718 | |
4719 static int | |
25546 | 4720 scrolling_window (w, header_line_p) |
25012 | 4721 struct window *w; |
25546 | 4722 int header_line_p; |
25012 | 4723 { |
4724 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4725 struct glyph_matrix *current_matrix = w->current_matrix; | |
4726 int yb = window_text_bottom_y (w); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4727 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
|
4728 int nruns, nbytes, n, run_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4729 struct row_entry *entry; |
25012 | 4730 |
4731 /* 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
|
4732 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i) |
25012 | 4733 { |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4734 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
|
4735 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
|
4736 |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4737 if (c->enabled_p |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4738 && d->enabled_p |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4739 && c->y == d->y |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4740 && MATRIX_ROW_BOTTOM_Y (c) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4741 && MATRIX_ROW_BOTTOM_Y (d) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4742 && row_equal_p (w, c, d, 1)) |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4743 { |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4744 assign_row (c, d); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4745 d->enabled_p = 0; |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4746 } |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4747 else |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4748 break; |
25012 | 4749 } |
4750 | |
4751 /* Give up if some rows in the desired matrix are not enabled. */ | |
4752 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4753 return -1; | |
4754 | |
4755 first_old = first_new = i; | |
4756 | |
4757 /* Set last_new to the index + 1 of the last enabled row in the | |
4758 desired matrix. */ | |
4759 i = first_new + 1; | |
4760 while (i < desired_matrix->nrows - 1 | |
4761 && MATRIX_ROW (desired_matrix, i)->enabled_p | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4762 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb) |
25012 | 4763 ++i; |
4764 | |
4765 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4766 return 0; | |
4767 | |
4768 last_new = i; | |
4769 | |
4770 /* Set last_old to the index + 1 of the last enabled row in the | |
4771 current matrix. We don't look at the enabled flag here because | |
4772 we plan to reuse part of the display even if other parts are | |
4773 disabled. */ | |
4774 i = first_old + 1; | |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4775 while (i < current_matrix->nrows - 1) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4776 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4777 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
|
4778 if (bottom <= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4779 ++i; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4780 if (bottom >= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4781 break; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4782 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4783 |
25012 | 4784 last_old = i; |
4785 | |
4786 /* Skip over rows equal at the bottom. */ | |
4787 i = last_new; | |
4788 j = last_old; | |
4789 while (i - 1 > first_new | |
4790 && j - 1 > first_old | |
4791 && MATRIX_ROW (current_matrix, i - 1)->enabled_p | |
4792 && (MATRIX_ROW (current_matrix, i - 1)->y | |
4793 == MATRIX_ROW (desired_matrix, j - 1)->y) | |
4794 && row_equal_p (w, | |
4795 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
|
4796 MATRIX_ROW (current_matrix, j - 1), 1)) |
25012 | 4797 --i, --j; |
4798 last_new = i; | |
4799 last_old = j; | |
4800 | |
4801 /* Nothing to do if all rows are equal. */ | |
4802 if (last_new == first_new) | |
4803 return 0; | |
4804 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4805 /* Reallocate vectors, tables etc. if necessary. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4806 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4807 if (current_matrix->nrows > old_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4808 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4809 old_lines_size = current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4810 nbytes = old_lines_size * sizeof *old_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4811 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4812 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4813 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4814 if (desired_matrix->nrows > new_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4815 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4816 new_lines_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4817 nbytes = new_lines_size * sizeof *new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4818 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4819 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4820 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4821 n = desired_matrix->nrows + current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4822 if (3 * n > row_table_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4823 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4824 row_table_size = next_almost_prime (3 * n); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4825 nbytes = row_table_size * sizeof *row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4826 row_table = (struct row_entry **) xrealloc (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4827 bzero (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4828 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4829 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4830 if (n > row_entry_pool_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4831 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4832 row_entry_pool_size = n; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4833 nbytes = row_entry_pool_size * sizeof *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4834 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
|
4835 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4836 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4837 if (desired_matrix->nrows > runs_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4838 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4839 runs_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4840 nbytes = runs_size * sizeof *runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4841 runs = (struct run **) xrealloc (runs, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4842 nbytes = runs_size * sizeof *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4843 run_pool = (struct run *) xrealloc (run_pool, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4844 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4845 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4846 nruns = run_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4847 row_entry_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4848 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4849 /* 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
|
4850 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
|
4851 |
25012 | 4852 for (i = first_old; i < last_old; ++i) |
4853 { | |
4854 if (MATRIX_ROW (current_matrix, i)->enabled_p) | |
4855 { | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4856 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
|
4857 old_lines[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4858 ++entry->old_uses; |
25012 | 4859 } |
4860 else | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4861 old_lines[i] = NULL; |
25012 | 4862 } |
4863 | |
4864 for (i = first_new; i < last_new; ++i) | |
4865 { | |
4866 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i)); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4867 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
|
4868 ++entry->new_uses; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4869 entry->new_line_number = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4870 new_lines[i] = entry; |
25012 | 4871 } |
4872 | |
4873 /* Identify moves based on lines that are unique and equal | |
4874 in both matrices. */ | |
4875 for (i = first_old; i < last_old;) | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4876 if (old_lines[i] |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4877 && old_lines[i]->old_uses == 1 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4878 && old_lines[i]->new_uses == 1) |
25012 | 4879 { |
4880 int j, k; | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4881 int new_line = old_lines[i]->new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4882 struct run *run = run_pool + run_idx++; |
25012 | 4883 |
4884 /* Record move. */ | |
4885 run->current_vpos = i; | |
4886 run->current_y = MATRIX_ROW (current_matrix, i)->y; | |
4887 run->desired_vpos = new_line; | |
4888 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y; | |
4889 run->nrows = 1; | |
4890 run->height = MATRIX_ROW (current_matrix, i)->height; | |
4891 | |
4892 /* Extend backward. */ | |
4893 j = i - 1; | |
4894 k = new_line - 1; | |
4895 while (j > first_old | |
4896 && k > first_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4897 && old_lines[j] == new_lines[k]) |
25012 | 4898 { |
4899 int h = MATRIX_ROW (current_matrix, j)->height; | |
4900 --run->current_vpos; | |
4901 --run->desired_vpos; | |
4902 ++run->nrows; | |
4903 run->height += h; | |
4904 run->desired_y -= h; | |
4905 run->current_y -= h; | |
4906 --j, --k; | |
4907 } | |
4908 | |
4909 /* Extend forward. */ | |
4910 j = i + 1; | |
4911 k = new_line + 1; | |
4912 while (j < last_old | |
4913 && k < last_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4914 && old_lines[j] == new_lines[k]) |
25012 | 4915 { |
4916 int h = MATRIX_ROW (current_matrix, j)->height; | |
4917 ++run->nrows; | |
4918 run->height += h; | |
4919 ++j, ++k; | |
4920 } | |
4921 | |
4922 /* Insert run into list of all runs. Order runs by copied | |
4923 pixel lines. Note that we record runs that don't have to | |
4924 be copied because they are already in place. This is done | |
4925 because we can avoid calling update_window_line in this | |
4926 case. */ | |
4927 for (j = 0; j < nruns && runs[j]->height > run->height; ++j) | |
4928 ; | |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
4929 for (k = nruns; k > j; --k) |
25012 | 4930 runs[k] = runs[k - 1]; |
4931 runs[j] = run; | |
4932 ++nruns; | |
4933 | |
4934 i += run->nrows; | |
4935 } | |
4936 else | |
4937 ++i; | |
4938 | |
4939 /* Do the moves. Do it in a way that we don't overwrite something | |
4940 we want to copy later on. This is not solvable in general | |
4941 because there is only one display and we don't have a way to | |
4942 exchange areas on this display. Example: | |
4943 | |
4944 +-----------+ +-----------+ | |
4945 | A | | B | | |
4946 +-----------+ --> +-----------+ | |
4947 | B | | A | | |
4948 +-----------+ +-----------+ | |
4949 | |
4950 Instead, prefer bigger moves, and invalidate moves that would | |
4951 copy from where we copied to. */ | |
4952 | |
4953 for (i = 0; i < nruns; ++i) | |
4954 if (runs[i]->nrows > 0) | |
4955 { | |
4956 struct run *r = runs[i]; | |
4957 | |
4958 /* Copy on the display. */ | |
4959 if (r->current_y != r->desired_y) | |
4960 { | |
4961 rif->scroll_run_hook (w, r); | |
4962 | |
4963 /* Invalidate runs that copy from where we copied to. */ | |
4964 for (j = i + 1; j < nruns; ++j) | |
4965 { | |
4966 struct run *p = runs[j]; | |
4967 | |
4968 if ((p->current_y >= r->desired_y | |
4969 && p->current_y < r->desired_y + r->height) | |
4970 || (p->current_y + p->height >= r->desired_y | |
4971 && (p->current_y + p->height | |
4972 < r->desired_y + r->height))) | |
4973 p->nrows = 0; | |
4974 } | |
4975 } | |
4976 | |
4977 /* Assign matrix rows. */ | |
4978 for (j = 0; j < r->nrows; ++j) | |
4979 { | |
4980 struct glyph_row *from, *to; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4981 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
|
4982 |
25012 | 4983 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
|
4984 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
|
4985 to_overlapped_p = to->overlapped_p; |
25012 | 4986 assign_row (to, from); |
4987 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
|
4988 to->overlapped_p = to_overlapped_p; |
25012 | 4989 } |
4990 } | |
4991 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4992 /* Clear the hash table, for the next time. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4993 for (i = 0; i < row_entry_idx; ++i) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4994 row_table[row_entry_pool[i].bucket] = NULL; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4995 |
25012 | 4996 /* Value is non-zero to indicate that we scrolled the display. */ |
4997 return 1; | |
4998 } | |
4999 | |
5000 | |
5001 | |
5002 /************************************************************************ | |
5003 Frame-Based Updates | |
5004 ************************************************************************/ | |
5005 | |
5006 /* Update the desired frame matrix of frame F. | |
5007 | |
5008 FORCE_P non-zero means that the update should not be stopped by | |
5009 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling | |
5010 should not be tried. | |
5011 | |
5012 Value is non-zero if update was stopped due to pending input. */ | |
5013 | |
5014 static int | |
5015 update_frame_1 (f, force_p, inhibit_id_p) | |
5016 struct frame *f; | |
5017 int force_p; | |
5018 int inhibit_id_p; | |
5019 { | |
5020 /* Frame matrices to work on. */ | |
5021 struct glyph_matrix *current_matrix = f->current_matrix; | |
5022 struct glyph_matrix *desired_matrix = f->desired_matrix; | |
5023 int i; | |
314 | 5024 int pause; |
5025 int preempt_count = baud_rate / 2400 + 1; | |
21514 | 5026 extern int input_pending; |
25012 | 5027 |
5028 xassert (current_matrix && desired_matrix); | |
314 | 5029 |
10122
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5030 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
|
5031 calculate_costs (f); |
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5032 |
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5033 if (preempt_count <= 0) |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5034 preempt_count = 1; |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5035 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5036 if (redisplay_dont_pause) |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5037 force_p = 1; |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5038 else if (!force_p && detect_input_pending ()) |
314 | 5039 { |
5040 pause = 1; | |
5041 goto do_pause; | |
5042 } | |
5043 | |
25012 | 5044 /* If we cannot insert/delete lines, it's no use trying it. */ |
314 | 5045 if (!line_ins_del_ok) |
25012 | 5046 inhibit_id_p = 1; |
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
5047 |
493 | 5048 /* See if any of the desired lines are enabled; don't compute for |
25012 | 5049 i/d line if just want cursor motion. */ |
5050 for (i = 0; i < desired_matrix->nrows; i++) | |
5051 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
314 | 5052 break; |
5053 | |
5054 /* Try doing i/d line, if not yet inhibited. */ | |
25012 | 5055 if (!inhibit_id_p && i < desired_matrix->nrows) |
5056 force_p |= scrolling (f); | |
314 | 5057 |
5058 /* Update the individual lines as needed. Do bottom line first. */ | |
25012 | 5059 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1)) |
5060 update_frame_line (f, desired_matrix->nrows - 1); | |
5061 | |
5062 /* Now update the rest of the lines. */ | |
5063 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++) | |
314 | 5064 { |
25012 | 5065 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) |
314 | 5066 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5067 if (FRAME_TERMCAP_P (f)) |
314 | 5068 { |
5069 /* Flush out every so many lines. | |
5070 Also flush out if likely to have more than 1k buffered | |
5071 otherwise. I'm told that some telnet connections get | |
5072 really screwed by more than 1k output at once. */ | |
5073 int outq = PENDING_OUTPUT_COUNT (stdout); | |
5074 if (outq > 900 | |
5075 || (outq > 20 && ((i - 1) % preempt_count == 0))) | |
5076 { | |
5077 fflush (stdout); | |
5078 if (preempt_count == 1) | |
5079 { | |
554 | 5080 #ifdef EMACS_OUTQSIZE |
5081 if (EMACS_OUTQSIZE (0, &outq) < 0) | |
314 | 5082 /* Probably not a tty. Ignore the error and reset |
25012 | 5083 * the outq count. */ |
314 | 5084 outq = PENDING_OUTPUT_COUNT (stdout); |
5085 #endif | |
5086 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
|
5087 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
|
5088 sleep (outq / baud_rate); |
314 | 5089 } |
5090 } | |
5091 } | |
5092 | |
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5093 if ((i - 1) % preempt_count == 0) |
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5094 detect_input_pending (); |
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5095 |
25012 | 5096 update_frame_line (f, i); |
314 | 5097 } |
5098 } | |
25012 | 5099 |
764 | 5100 pause = (i < FRAME_HEIGHT (f) - 1) ? i : 0; |
314 | 5101 |
5102 /* Now just clean up termcap drivers and set cursor, etc. */ | |
5103 if (!pause) | |
5104 { | |
12409
6e374b28ecc3
(update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents:
12193
diff
changeset
|
5105 if ((cursor_in_echo_area |
25012 | 5106 /* 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
|
5107 show the cursor for the message instead of for the |
25012 | 5108 (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
|
5109 || (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
|
5110 && EQ (minibuf_window, echo_area_window) |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5111 && !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
|
5112 /* These cases apply only to the frame that contains |
25012 | 5113 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
|
5114 && FRAME_HAS_MINIBUF_P (f) |
14459
c1d25453a95f
(update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents:
14286
diff
changeset
|
5115 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) |
708 | 5116 { |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5117 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
|
5118 int row, col; |
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 if (cursor_in_echo_area < 0) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5121 { |
25012 | 5122 /* Negative value of cursor_in_echo_area means put |
5123 cursor at beginning of line. */ | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5124 row = top; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5125 col = 0; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5126 } |
708 | 5127 else |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5128 { |
25012 | 5129 /* Positive value of cursor_in_echo_area means put |
5130 cursor at the end of the prompt. If the mini-buffer | |
5131 is several lines high, find the last line that has | |
5132 any text on it. */ | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5133 row = FRAME_HEIGHT (f); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5134 do |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5135 { |
25012 | 5136 --row; |
5137 col = 0; | |
5138 | |
5139 if (MATRIX_ROW_ENABLED_P (current_matrix, row)) | |
5140 { | |
5141 /* Frame rows are filled up with spaces that | |
5142 must be ignored here. */ | |
5143 struct glyph_row *r = MATRIX_ROW (current_matrix, | |
5144 row); | |
5145 struct glyph *start = r->glyphs[TEXT_AREA]; | |
5146 struct glyph *last = start + r->used[TEXT_AREA]; | |
5147 | |
5148 while (last > start | |
5149 && (last - 1)->charpos < 0) | |
5150 --last; | |
5151 | |
5152 col = last - start; | |
5153 } | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5154 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5155 while (row > top && col == 0); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5156 |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5157 /* 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
|
5158 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
|
5159 { |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5160 /* 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
|
5161 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
|
5162 { |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5163 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
|
5164 row++; |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5165 } |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5166 /* 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
|
5167 else |
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
5168 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
|
5169 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5170 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5171 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5172 cursor_to (row, col); |
708 | 5173 } |
314 | 5174 else |
25012 | 5175 { |
5176 /* We have only one cursor on terminal frames. Use it to | |
5177 display the cursor of the selected window. */ | |
5178 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
|
5179 if (w->cursor.vpos >= 0 |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5180 /* 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
|
5181 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
|
5182 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
|
5183 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
|
5184 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
|
5185 && w->cursor.vpos < XFASTINT (w->height)) |
25012 | 5186 { |
5187 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); | |
5188 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
5189 | |
5190 if (INTEGERP (w->left_margin_width)) | |
5191 x += XFASTINT (w->left_margin_width); | |
5192 | |
5193 /* x = max (min (x, FRAME_WINDOW_WIDTH (f) - 1), 0); */ | |
5194 cursor_to (y, x); | |
5195 } | |
5196 } | |
314 | 5197 } |
5198 | |
5199 do_pause: | |
5200 | |
25012 | 5201 clear_desired_matrices (f); |
314 | 5202 return pause; |
5203 } | |
5204 | |
25012 | 5205 |
5206 /* Do line insertions/deletions on frame F for frame-based redisplay. */ | |
314 | 5207 |
21514 | 5208 int |
764 | 5209 scrolling (frame) |
25012 | 5210 struct frame *frame; |
314 | 5211 { |
5212 int unchanged_at_top, unchanged_at_bottom; | |
5213 int window_size; | |
5214 int changed_lines; | |
764 | 5215 int *old_hash = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); |
5216 int *new_hash = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); | |
5217 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
|
5218 int *old_draw_cost = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); |
314 | 5219 register int i; |
764 | 5220 int free_at_end_vpos = FRAME_HEIGHT (frame); |
25012 | 5221 struct glyph_matrix *current_matrix = frame->current_matrix; |
5222 struct glyph_matrix *desired_matrix = frame->desired_matrix; | |
5223 | |
5224 if (!current_matrix) | |
5225 abort (); | |
5226 | |
5227 /* Compute hash codes of all the lines. Also calculate number of | |
5228 changed lines, number of unchanged lines at the beginning, and | |
5229 number of unchanged lines at the end. */ | |
314 | 5230 changed_lines = 0; |
5231 unchanged_at_top = 0; | |
764 | 5232 unchanged_at_bottom = FRAME_HEIGHT (frame); |
5233 for (i = 0; i < FRAME_HEIGHT (frame); i++) | |
314 | 5234 { |
5235 /* Give up on this scrolling if some old lines are not enabled. */ | |
25012 | 5236 if (!MATRIX_ROW_ENABLED_P (current_matrix, i)) |
314 | 5237 return 0; |
25012 | 5238 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i)); |
5239 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
|
5240 { |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5241 /* 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
|
5242 new_hash[i] = old_hash[i]; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5243 #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
|
5244 draw_cost[i] = INFINITY; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5245 } |
314 | 5246 else |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5247 { |
25012 | 5248 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i)); |
5249 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
|
5250 } |
314 | 5251 |
5252 if (old_hash[i] != new_hash[i]) | |
5253 { | |
5254 changed_lines++; | |
764 | 5255 unchanged_at_bottom = FRAME_HEIGHT (frame) - i - 1; |
314 | 5256 } |
5257 else if (i == unchanged_at_top) | |
5258 unchanged_at_top++; | |
25012 | 5259 old_draw_cost[i] = line_draw_cost (current_matrix, i); |
314 | 5260 } |
5261 | |
5262 /* If changed lines are few, don't allow preemption, don't scroll. */ | |
25012 | 5263 if ((!scroll_region_ok && changed_lines < baud_rate / 2400) |
764 | 5264 || unchanged_at_bottom == FRAME_HEIGHT (frame)) |
314 | 5265 return 1; |
5266 | |
764 | 5267 window_size = (FRAME_HEIGHT (frame) - unchanged_at_top |
314 | 5268 - unchanged_at_bottom); |
5269 | |
5270 if (scroll_region_ok) | |
5271 free_at_end_vpos -= unchanged_at_bottom; | |
764 | 5272 else if (memory_below_frame) |
314 | 5273 free_at_end_vpos = -1; |
5274 | |
5275 /* If large window, fast terminal and few lines in common between | |
25012 | 5276 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
|
5277 if (!scroll_region_ok && window_size >= 18 && baud_rate > 2400 |
314 | 5278 && (window_size >= |
5279 10 * scrolling_max_lines_saved (unchanged_at_top, | |
764 | 5280 FRAME_HEIGHT (frame) - unchanged_at_bottom, |
314 | 5281 old_hash, new_hash, draw_cost))) |
5282 return 0; | |
5283 | |
25012 | 5284 if (window_size < 2) |
5285 return 0; | |
5286 | |
764 | 5287 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, |
314 | 5288 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
|
5289 old_draw_cost + unchanged_at_top - 1, |
314 | 5290 old_hash + unchanged_at_top - 1, |
5291 new_hash + unchanged_at_top - 1, | |
5292 free_at_end_vpos - unchanged_at_top); | |
5293 | |
5294 return 0; | |
5295 } | |
25012 | 5296 |
5297 | |
5298 /* Count the number of blanks at the start of the vector of glyphs R | |
5299 which is LEN glyphs long. */ | |
5300 | |
5301 static int | |
5302 count_blanks (r, len) | |
5303 struct glyph *r; | |
5304 int len; | |
314 | 5305 { |
25012 | 5306 int i; |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5307 |
25012 | 5308 for (i = 0; i < len; ++i) |
5309 if (!CHAR_GLYPH_SPACE_P (r[i])) | |
5310 break; | |
5311 | |
5312 return i; | |
314 | 5313 } |
25012 | 5314 |
5315 | |
5316 /* Count the number of glyphs in common at the start of the glyph | |
5317 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end | |
5318 of STR2. Value is the number of equal glyphs equal at the start. */ | |
314 | 5319 |
5320 static int | |
25012 | 5321 count_match (str1, end1, str2, end2) |
5322 struct glyph *str1, *end1, *str2, *end2; | |
314 | 5323 { |
25012 | 5324 struct glyph *p1 = str1; |
5325 struct glyph *p2 = str2; | |
5326 | |
5327 while (p1 < end1 | |
5328 && p2 < end2 | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
5329 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2)) |
25012 | 5330 ++p1, ++p2; |
5331 | |
5332 return p1 - str1; | |
314 | 5333 } |
5334 | |
25012 | 5335 |
314 | 5336 /* Char insertion/deletion cost vector, from term.c */ |
25012 | 5337 |
314 | 5338 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
|
5339 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_WINDOW_WIDTH((f))]) |
314 | 5340 |
25012 | 5341 |
5342 /* Perform a frame-based update on line VPOS in frame FRAME. */ | |
5343 | |
314 | 5344 static void |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5345 update_frame_line (f, vpos) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5346 struct frame *f; |
314 | 5347 int vpos; |
5348 { | |
25012 | 5349 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend; |
314 | 5350 int tem; |
5351 int osp, nsp, begmatch, endmatch, olen, nlen; | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5352 struct glyph_matrix *current_matrix = f->current_matrix; |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5353 struct glyph_matrix *desired_matrix = f->desired_matrix; |
25012 | 5354 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos); |
5355 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos); | |
5356 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
|
5357 int write_spaces_p = must_write_spaces; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5358 int colored_spaces_p = (FACE_FROM_ID (f, DEFAULT_FACE_ID)->background |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5359 != FACE_TTY_DEFAULT_BG_COLOR); |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5360 |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5361 if (colored_spaces_p) |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5362 write_spaces_p = 1; |
25012 | 5363 |
5364 if (desired_row->inverse_p | |
5365 != (current_row->enabled_p && current_row->inverse_p)) | |
314 | 5366 { |
25012 | 5367 int n = current_row->enabled_p ? current_row->used[TEXT_AREA] : 0; |
5368 change_line_highlight (desired_row->inverse_p, vpos, vpos, n); | |
5369 current_row->enabled_p = 0; | |
314 | 5370 } |
5371 else | |
25012 | 5372 reassert_line_highlight (desired_row->inverse_p, vpos); |
5373 | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5374 /* 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
|
5375 write the whole desired line in that case. */ |
25012 | 5376 must_write_whole_line_p = !current_row->enabled_p; |
5377 if (must_write_whole_line_p) | |
314 | 5378 { |
25012 | 5379 obody = 0; |
314 | 5380 olen = 0; |
5381 } | |
5382 else | |
5383 { | |
25012 | 5384 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos); |
5385 olen = current_row->used[TEXT_AREA]; | |
5386 | |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5387 if (!current_row->inverse_p) |
314 | 5388 { |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5389 /* 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
|
5390 if (!write_spaces_p) |
25012 | 5391 while (olen > 0 && CHAR_GLYPH_SPACE_P (obody[olen-1])) |
314 | 5392 olen--; |
5393 } | |
5394 else | |
5395 { | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5396 /* 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
|
5397 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
|
5398 video extends all the way across. */ |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5399 while (olen < FRAME_WIDTH (f) - 1) |
25012 | 5400 obody[olen++] = space_glyph; |
314 | 5401 } |
5402 } | |
5403 | |
25012 | 5404 current_row->enabled_p = 1; |
5405 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA]; | |
5406 current_row->inverse_p = desired_row->inverse_p; | |
5407 | |
5408 /* If desired line is empty, just clear the line. */ | |
5409 if (!desired_row->enabled_p) | |
314 | 5410 { |
5411 nlen = 0; | |
5412 goto just_erase; | |
5413 } | |
5414 | |
25012 | 5415 nbody = desired_row->glyphs[TEXT_AREA]; |
5416 nlen = desired_row->used[TEXT_AREA]; | |
5417 nend = nbody + nlen; | |
5418 | |
5419 /* If display line has unknown contents, write the whole line. */ | |
5420 if (must_write_whole_line_p) | |
5421 { | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5422 /* 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
|
5423 if (!write_spaces_p) |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5424 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
|
5425 --nlen; |
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5426 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5427 /* 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
|
5428 if (nlen) |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5429 { |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5430 cursor_to (vpos, 0); |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5431 write_glyphs (nbody, nlen); |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5432 } |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5433 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5434 /* 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
|
5435 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
|
5436 case but in the line below. */ |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5437 if (nlen < FRAME_WINDOW_WIDTH (f)) |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5438 { |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5439 cursor_to (vpos, nlen); |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5440 clear_end_of_line (FRAME_WINDOW_WIDTH (f)); |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5441 } |
28682
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5442 else |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5443 /* 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
|
5444 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
|
5445 cursor_to (vpos, 0); |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5446 |
25012 | 5447 make_current (desired_matrix, current_matrix, vpos); |
5448 return; | |
5449 } | |
314 | 5450 |
5451 /* Pretend trailing spaces are not there at all, | |
5452 unless for one reason or another we must write all spaces. */ | |
25012 | 5453 if (!desired_row->inverse_p) |
314 | 5454 { |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5455 if (!write_spaces_p) |
25012 | 5456 while (nlen > 0 && CHAR_GLYPH_SPACE_P (nbody[nlen - 1])) |
314 | 5457 nlen--; |
5458 } | |
5459 else | |
5460 { | |
25012 | 5461 /* For an inverse-video line, give it extra trailing spaces all |
5462 the way to the frame edge so that the reverse video extends | |
5463 all the way across. */ | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5464 while (nlen < FRAME_WIDTH (f) - 1) |
25012 | 5465 nbody[nlen++] = space_glyph; |
314 | 5466 } |
5467 | |
5468 /* If there's no i/d char, quickly do the best we can without it. */ | |
5469 if (!char_ins_del_ok) | |
5470 { | |
25012 | 5471 int i, j; |
5472 | |
5473 /* Find the first glyph in desired row that doesn't agree with | |
5474 a glyph in the current row, and write the rest from there on. */ | |
314 | 5475 for (i = 0; i < nlen; i++) |
5476 { | |
25012 | 5477 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i)) |
314 | 5478 { |
25012 | 5479 /* Find the end of the run of different glyphs. */ |
5480 j = i + 1; | |
5481 while (j < nlen | |
5482 && (j >= olen | |
5483 || !GLYPH_EQUAL_P (nbody + j, obody + j) | |
5484 || CHAR_GLYPH_PADDING_P (nbody[j]))) | |
5485 ++j; | |
5486 | |
5487 /* Output this run of non-matching chars. */ | |
314 | 5488 cursor_to (vpos, i); |
25012 | 5489 write_glyphs (nbody + i, j - i); |
5490 i = j - 1; | |
314 | 5491 |
5492 /* Now find the next non-match. */ | |
5493 } | |
5494 } | |
5495 | |
5496 /* Clear the rest of the line, or the non-clear part of it. */ | |
5497 if (olen > nlen) | |
5498 { | |
5499 cursor_to (vpos, nlen); | |
5500 clear_end_of_line (olen); | |
5501 } | |
5502 | |
25012 | 5503 /* Make current row = desired row. */ |
5504 make_current (desired_matrix, current_matrix, vpos); | |
314 | 5505 return; |
5506 } | |
5507 | |
25012 | 5508 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete |
5509 characters in a row. */ | |
5510 | |
314 | 5511 if (!olen) |
5512 { | |
25012 | 5513 /* If current line is blank, skip over initial spaces, if |
5514 possible, and write the rest. */ | |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5515 if (write_spaces_p || desired_row->inverse_p) |
25012 | 5516 nsp = 0; |
5517 else | |
5518 nsp = count_blanks (nbody, nlen); | |
5519 | |
314 | 5520 if (nlen > nsp) |
5521 { | |
5522 cursor_to (vpos, nsp); | |
5523 write_glyphs (nbody + nsp, nlen - nsp); | |
5524 } | |
5525 | |
764 | 5526 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5527 make_current (desired_matrix, current_matrix, vpos); |
314 | 5528 return; |
5529 } | |
5530 | |
5531 /* Compute number of leading blanks in old and new contents. */ | |
25012 | 5532 osp = count_blanks (obody, olen); |
33101
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5533 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
|
5534 ? 0 |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5535 : count_blanks (nbody, nlen)); |
25012 | 5536 |
5537 /* Compute number of matching chars starting with first non-blank. */ | |
5538 begmatch = count_match (obody + osp, obody + olen, | |
5539 nbody + nsp, nbody + nlen); | |
314 | 5540 |
5541 /* Spaces in new match implicit space past the end of old. */ | |
5542 /* 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
|
5543 if (!write_spaces_p && osp + begmatch == olen) |
314 | 5544 { |
5545 np1 = nbody + nsp; | |
25012 | 5546 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch])) |
5547 ++begmatch; | |
314 | 5548 } |
5549 | |
5550 /* Avoid doing insert/delete char | |
5551 just cause number of leading spaces differs | |
25012 | 5552 when the following text does not match. */ |
314 | 5553 if (begmatch == 0 && osp != nsp) |
5554 osp = nsp = min (osp, nsp); | |
5555 | |
5556 /* Find matching characters at end of line */ | |
5557 op1 = obody + olen; | |
5558 np1 = nbody + nlen; | |
5559 op2 = op1 + begmatch - min (olen - osp, nlen - nsp); | |
25012 | 5560 while (op1 > op2 |
5561 && GLYPH_EQUAL_P (op1 - 1, np1 - 1)) | |
314 | 5562 { |
5563 op1--; | |
5564 np1--; | |
5565 } | |
5566 endmatch = obody + olen - op1; | |
5567 | |
5568 /* tem gets the distance to insert or delete. | |
5569 endmatch is how many characters we save by doing so. | |
5570 Is it worth it? */ | |
5571 | |
5572 tem = (nlen - nsp) - (olen - osp); | |
5573 if (endmatch && tem | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5574 && (!char_ins_del_ok || endmatch <= char_ins_del_cost (f)[tem])) |
314 | 5575 endmatch = 0; |
5576 | |
5577 /* nsp - osp is the distance to insert or delete. | |
5578 If that is nonzero, begmatch is known to be nonzero also. | |
5579 begmatch + endmatch is how much we save by doing the ins/del. | |
5580 Is it worth it? */ | |
5581 | |
5582 if (nsp != osp | |
5583 && (!char_ins_del_ok | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5584 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp])) |
314 | 5585 { |
5586 begmatch = 0; | |
5587 endmatch = 0; | |
5588 osp = nsp = min (osp, nsp); | |
5589 } | |
5590 | |
5591 /* Now go through the line, inserting, writing and | |
5592 deleting as appropriate. */ | |
5593 | |
5594 if (osp > nsp) | |
5595 { | |
5596 cursor_to (vpos, nsp); | |
5597 delete_glyphs (osp - nsp); | |
5598 } | |
5599 else if (nsp > osp) | |
5600 { | |
5601 /* If going to delete chars later in line | |
5602 and insert earlier in the line, | |
5603 must delete first to avoid losing data in the insert */ | |
5604 if (endmatch && nlen < olen + nsp - osp) | |
5605 { | |
5606 cursor_to (vpos, nlen - endmatch + osp - nsp); | |
5607 delete_glyphs (olen + nsp - osp - nlen); | |
5608 olen = nlen - (nsp - osp); | |
5609 } | |
5610 cursor_to (vpos, osp); | |
25012 | 5611 insert_glyphs (0, nsp - osp); |
314 | 5612 } |
5613 olen += nsp - osp; | |
5614 | |
5615 tem = nsp + begmatch + endmatch; | |
5616 if (nlen != tem || olen != tem) | |
5617 { | |
5618 if (!endmatch || nlen == olen) | |
5619 { | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5620 /* If new text being written reaches right margin, there is |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5621 no need to do clear-to-eol at the end of this function |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5622 (and it would not be safe, since cursor is not going to |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5623 be "at the margin" after the text is done). */ |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5624 if (nlen == FRAME_WINDOW_WIDTH (f)) |
314 | 5625 olen = 0; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5626 |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5627 /* Function write_glyphs is prepared to do nothing |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5628 if passed a length <= 0. Check it here to avoid |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5629 unnecessary cursor movement. */ |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5630 if (nlen - tem > 0) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5631 { |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5632 cursor_to (vpos, nsp + begmatch); |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5633 write_glyphs (nbody + nsp + begmatch, nlen - tem); |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5634 } |
314 | 5635 } |
5636 else if (nlen > olen) | |
5637 { | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5638 /* 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
|
5639 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5640 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
|
5641 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
|
5642 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5643 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
|
5644 is a padding glyph. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5645 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
|
5646 int del; |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5647 |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5648 cursor_to (vpos, nsp + begmatch); |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5649 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5650 /* Calculate columns we can actually overwrite. */ |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5651 while (CHAR_GLYPH_PADDING_P (nbody[nsp + begmatch + out])) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5652 out--; |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5653 write_glyphs (nbody + nsp + begmatch, out); |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5654 |
25012 | 5655 /* 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
|
5656 del = olen - tem - out; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5657 if (del > 0) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5658 delete_glyphs (del); |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5659 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5660 /* 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
|
5661 insert_glyphs (nbody + nsp + begmatch + out, nlen - olen + del); |
314 | 5662 olen = nlen; |
5663 } | |
5664 else if (olen > nlen) | |
5665 { | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5666 cursor_to (vpos, nsp + begmatch); |
314 | 5667 write_glyphs (nbody + nsp + begmatch, nlen - tem); |
5668 delete_glyphs (olen - nlen); | |
5669 olen = nlen; | |
5670 } | |
5671 } | |
5672 | |
5673 just_erase: | |
5674 /* If any unerased characters remain after the new line, erase them. */ | |
5675 if (olen > nlen) | |
5676 { | |
5677 cursor_to (vpos, nlen); | |
5678 clear_end_of_line (olen); | |
5679 } | |
5680 | |
764 | 5681 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5682 make_current (desired_matrix, current_matrix, vpos); |
314 | 5683 } |
25012 | 5684 |
5685 | |
314 | 5686 |
25012 | 5687 /*********************************************************************** |
5688 X/Y Position -> Buffer Position | |
5689 ***********************************************************************/ | |
5690 | |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5691 /* Determine what's under window-relative pixel position (*X, *Y). |
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5692 Return in *OBJECT the object (string or buffer) that's there. |
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5693 Return in *POS the position in that object. Adjust *X and *Y |
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5694 to character boundaries. */ |
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5695 |
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5696 void |
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5697 buffer_posn_from_coords (w, x, y, object, pos) |
25012 | 5698 struct window *w; |
5699 int *x, *y; | |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5700 Lisp_Object *object; |
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5701 struct display_pos *pos; |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5702 { |
25012 | 5703 struct it it; |
5704 struct buffer *old_current_buffer = current_buffer; | |
5705 struct text_pos startp; | |
5706 int left_area_width; | |
5707 | |
5708 current_buffer = XBUFFER (w->buffer); | |
5709 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
5710 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp))); | |
5711 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp))); | |
5712 start_display (&it, w, startp); | |
5713 | |
5714 left_area_width = WINDOW_DISPLAY_LEFT_AREA_PIXEL_WIDTH (w); | |
5715 move_it_to (&it, -1, *x + it.first_visible_x - left_area_width, *y, -1, | |
5716 MOVE_TO_X | MOVE_TO_Y); | |
5717 | |
5718 *x = it.current_x - it.first_visible_x + left_area_width; | |
5719 *y = it.current_y; | |
5720 current_buffer = old_current_buffer; | |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5721 |
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5722 *object = STRINGP (it.string) ? it.string : w->buffer; |
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5723 *pos = it.current; |
25012 | 5724 } |
5725 | |
5726 | |
5727 /* Value is the string under window-relative coordinates X/Y in the | |
5728 mode or top line of window W, or nil if none. MODE_LINE_P non-zero | |
5729 means look at the mode line. *CHARPOS is set to the position in | |
5730 the string returned. */ | |
5731 | |
5732 Lisp_Object | |
5733 mode_line_string (w, x, y, mode_line_p, charpos) | |
5734 struct window *w; | |
30713
fee809f81f97
(mode_line_string): Declare parameter MODE_LINE_P.
Gerd Moellmann <gerd@gnu.org>
parents:
30323
diff
changeset
|
5735 int x, y, mode_line_p; |
25012 | 5736 int *charpos; |
5737 { | |
5738 struct glyph_row *row; | |
5739 struct glyph *glyph, *end; | |
5740 struct frame *f = XFRAME (w->frame); | |
5741 int x0; | |
5742 Lisp_Object string = Qnil; | |
5743 | |
5744 if (mode_line_p) | |
5745 row = MATRIX_MODE_LINE_ROW (w->current_matrix); | |
5746 else | |
25546 | 5747 row = MATRIX_HEADER_LINE_ROW (w->current_matrix); |
25012 | 5748 |
5749 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
|
5750 { |
25012 | 5751 /* The mode lines are displayed over scroll bars and bitmap |
5752 areas, and X is window-relative. Correct X by the scroll bar | |
5753 and bitmap area width. */ | |
5754 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) | |
5755 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
|
5756 x += FRAME_LEFT_FLAGS_AREA_WIDTH (f); |
25012 | 5757 |
5758 /* Find the glyph under X. If we find one with a string object, | |
5759 it's the one we were looking for. */ | |
5760 glyph = row->glyphs[TEXT_AREA]; | |
5761 end = glyph + row->used[TEXT_AREA]; | |
5762 for (x0 = 0; glyph < end; x0 += glyph->pixel_width, ++glyph) | |
5763 if (x >= x0 && x < x0 + glyph->pixel_width) | |
5764 { | |
5765 string = glyph->object; | |
5766 *charpos = glyph->charpos; | |
5767 break; | |
5768 } | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5769 } |
25012 | 5770 |
5771 return string; | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5772 } |
25012 | 5773 |
5774 | |
5775 /*********************************************************************** | |
5776 Changing Frame Sizes | |
5777 ***********************************************************************/ | |
314 | 5778 |
5779 #ifdef SIGWINCH | |
25012 | 5780 |
493 | 5781 SIGTYPE |
10745
a553a08f5785
(window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents:
10259
diff
changeset
|
5782 window_change_signal (signalnum) /* If we don't have an argument, */ |
25012 | 5783 int signalnum; /* some compilers complain in signal calls. */ |
314 | 5784 { |
5785 int width, height; | |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
5786 #ifndef USE_CRT_DLL |
314 | 5787 extern int errno; |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
5788 #endif |
314 | 5789 int old_errno = errno; |
5790 | |
764 | 5791 get_frame_size (&width, &height); |
314 | 5792 |
764 | 5793 /* The frame size change obviously applies to a termcap-controlled |
5794 frame. Find such a frame in the list, and assume it's the only | |
314 | 5795 one (since the redisplay code always writes to stdout, not a |
764 | 5796 FILE * specified in the frame structure). Record the new size, |
314 | 5797 but don't reallocate the data structures now. Let that be done |
5798 later outside of the signal handler. */ | |
5799 | |
5800 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5801 Lisp_Object tail, frame; |
314 | 5802 |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5803 FOR_EACH_FRAME (tail, frame) |
314 | 5804 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5805 if (FRAME_TERMCAP_P (XFRAME (frame))) |
314 | 5806 { |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5807 change_frame_size (XFRAME (frame), height, width, 0, 1, 0); |
314 | 5808 break; |
5809 } | |
5810 } | |
5811 } | |
5812 | |
5813 signal (SIGWINCH, window_change_signal); | |
5814 errno = old_errno; | |
5815 } | |
5816 #endif /* SIGWINCH */ | |
5817 | |
5818 | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5819 /* 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
|
5820 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
|
5821 safe to change frame sizes while a redisplay is in progress. */ |
314 | 5822 |
21514 | 5823 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5824 do_pending_window_change (safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5825 int safe; |
314 | 5826 { |
5827 /* 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
|
5828 if (redisplaying_p && !safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5829 return; |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5830 |
314 | 5831 while (delayed_size_change) |
5832 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5833 Lisp_Object tail, frame; |
314 | 5834 |
5835 delayed_size_change = 0; | |
5836 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
5837 FOR_EACH_FRAME (tail, frame) |
314 | 5838 { |
25012 | 5839 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
|
5840 |
764 | 5841 int height = FRAME_NEW_HEIGHT (f); |
5842 int width = FRAME_NEW_WIDTH (f); | |
314 | 5843 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
5844 if (height != 0 || width != 0) |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5845 change_frame_size (f, height, width, 0, 0, safe); |
314 | 5846 } |
5847 } | |
5848 } | |
5849 | |
5850 | |
764 | 5851 /* 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
|
5852 indicate no change is to take place. |
314 | 5853 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5854 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
|
5855 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
|
5856 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
|
5857 from a signal handler. |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5858 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5859 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
|
5860 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
|
5861 |
21514 | 5862 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5863 change_frame_size (f, newheight, newwidth, pretend, delay, safe) |
25012 | 5864 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5865 int newheight, newwidth, pretend, delay, safe; |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5866 { |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5867 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
|
5868 |
15395
b584c2db055f
(change_frame_size, remake_frame_glyphs): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15394
diff
changeset
|
5869 if (! FRAME_WINDOW_P (f)) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5870 { |
15394
8d01f71c4797
(Fredraw_frame, remake_frame_glyphs)
Richard M. Stallman <rms@gnu.org>
parents:
15282
diff
changeset
|
5871 /* 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
|
5872 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
|
5873 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
|
5874 if (! FRAME_WINDOW_P (XFRAME (frame))) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5875 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
|
5876 pretend, delay, safe); |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5877 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5878 else |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5879 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
|
5880 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5881 |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
5882 static void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5883 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) |
25012 | 5884 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5885 int newheight, newwidth, pretend, delay, safe; |
314 | 5886 { |
16256
1ce0cb94fa68
(preserve_other_columns, preserve_my_columns): Use new
Richard M. Stallman <rms@gnu.org>
parents:
16195
diff
changeset
|
5887 int new_frame_window_width; |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
5888 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
|
5889 |
314 | 5890 /* 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
|
5891 if (delay || (redisplaying_p && !safe)) |
314 | 5892 { |
25012 | 5893 FRAME_NEW_HEIGHT (f) = newheight; |
5894 FRAME_NEW_WIDTH (f) = newwidth; | |
314 | 5895 delayed_size_change = 1; |
5896 return; | |
5897 } | |
5898 | |
764 | 5899 /* This size-change overrides any pending one for this frame. */ |
25012 | 5900 FRAME_NEW_HEIGHT (f) = 0; |
5901 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
|
5902 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
5903 /* 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
|
5904 if (newheight == 0) |
25012 | 5905 newheight = FRAME_HEIGHT (f); |
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
5906 if (newwidth == 0) |
25012 | 5907 newwidth = FRAME_WIDTH (f); |
5908 | |
5909 /* Compute width of windows in F. | |
5910 This is the width of the frame without vertical scroll bars. */ | |
5911 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
|
5912 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5913 /* Round up to the smallest acceptable size. */ |
25012 | 5914 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
|
5915 |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5916 /* If we're not changing the frame size, quit now. */ |
25012 | 5917 if (newheight == FRAME_HEIGHT (f) |
5918 && new_frame_window_width == FRAME_WINDOW_WIDTH (f)) | |
314 | 5919 return; |
5920 | |
15078 | 5921 BLOCK_INPUT; |
5922 | |
14286
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5923 #ifdef MSDOS |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5924 /* 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
|
5925 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
|
5926 or equal to the requested dimensions. */ |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5927 dos_set_window_size (&newheight, &newwidth); |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5928 #endif |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
5929 |
25012 | 5930 if (newheight != FRAME_HEIGHT (f)) |
314 | 5931 { |
25012 | 5932 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) |
314 | 5933 { |
25012 | 5934 /* Frame has both root and mini-buffer. */ |
5935 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top, | |
5936 FRAME_TOP_MARGIN (f)); | |
5937 set_window_height (FRAME_ROOT_WINDOW (f), | |
5938 (newheight | |
5939 - 1 | |
5940 - FRAME_TOP_MARGIN (f)), | |
5941 0); | |
5942 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
|
5943 newheight - 1); |
25012 | 5944 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0); |
314 | 5945 } |
5946 else | |
764 | 5947 /* Frame has just one top-level window. */ |
25012 | 5948 set_window_height (FRAME_ROOT_WINDOW (f), |
5949 newheight - FRAME_TOP_MARGIN (f), 0); | |
5950 | |
5951 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
|
5952 FrameRows = newheight; |
314 | 5953 } |
5954 | |
25012 | 5955 if (new_frame_window_width != FRAME_WINDOW_WIDTH (f)) |
314 | 5956 { |
25012 | 5957 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_window_width, 0); |
5958 if (FRAME_HAS_MINIBUF_P (f)) | |
5959 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_window_width, 0); | |
5960 | |
5961 if (FRAME_TERMCAP_P (f) && !pretend) | |
764 | 5962 FrameCols = newwidth; |
25012 | 5963 |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
5964 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
|
5965 XSETFASTINT (XWINDOW (f->tool_bar_window)->width, newwidth); |
314 | 5966 } |
5967 | |
25012 | 5968 FRAME_HEIGHT (f) = newheight; |
5969 SET_FRAME_WIDTH (f, newwidth); | |
5970 | |
5971 { | |
5972 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
5973 int text_area_x, text_area_y, text_area_width, text_area_height; | |
5974 | |
5975 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width, | |
5976 &text_area_height); | |
5977 if (w->cursor.x >= text_area_x + text_area_width) | |
5978 w->cursor.hpos = w->cursor.x = 0; | |
5979 if (w->cursor.y >= text_area_y + text_area_height) | |
5980 w->cursor.vpos = w->cursor.y = 0; | |
5981 } | |
5982 | |
5983 adjust_glyphs (f); | |
5984 SET_FRAME_GARBAGED (f); | |
5985 calculate_costs (f); | |
15065 | 5986 |
5987 UNBLOCK_INPUT; | |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
5988 |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
5989 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
|
5990 |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
5991 /* This isn't quite a no-op: it runs window-configuration-change-hook. */ |
25012 | 5992 Fset_window_buffer (FRAME_SELECTED_WINDOW (f), |
5993 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
|
5994 |
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
5995 unbind_to (count, Qnil); |
314 | 5996 } |
25012 | 5997 |
5998 | |
314 | 5999 |
25012 | 6000 /*********************************************************************** |
6001 Terminal Related Lisp Functions | |
6002 ***********************************************************************/ | |
6003 | |
6004 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript, | |
6005 1, 1, "FOpen termscript file: ", | |
6006 "Start writing all terminal output to FILE as well as the terminal.\n\ | |
6007 FILE = nil means just close any termscript file currently open.") | |
6008 (file) | |
6009 Lisp_Object file; | |
6010 { | |
6011 if (termscript != 0) fclose (termscript); | |
6012 termscript = 0; | |
6013 | |
6014 if (! NILP (file)) | |
6015 { | |
6016 file = Fexpand_file_name (file, Qnil); | |
6017 termscript = fopen (XSTRING (file)->data, "w"); | |
6018 if (termscript == 0) | |
6019 report_file_error ("Opening termscript", Fcons (file, Qnil)); | |
6020 } | |
6021 return Qnil; | |
6022 } | |
6023 | |
6024 | |
314 | 6025 DEFUN ("send-string-to-terminal", Fsend_string_to_terminal, |
6026 Ssend_string_to_terminal, 1, 1, 0, | |
6027 "Send STRING to the terminal without alteration.\n\ | |
6028 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
|
6029 (string) |
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
6030 Lisp_Object string; |
314 | 6031 { |
20618
d5acac3af6e3
(Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents:
19627
diff
changeset
|
6032 /* ??? 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
|
6033 CHECK_STRING (string, 0); |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6034 fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), stdout); |
314 | 6035 fflush (stdout); |
6036 if (termscript) | |
6037 { | |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6038 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
|
6039 termscript); |
314 | 6040 fflush (termscript); |
6041 } | |
6042 return Qnil; | |
6043 } | |
6044 | |
25012 | 6045 |
314 | 6046 DEFUN ("ding", Fding, Sding, 0, 1, 0, |
6047 "Beep, or flash the screen.\n\ | |
6048 Also, unless an argument is given,\n\ | |
6049 terminate any keyboard macro currently executing.") | |
6050 (arg) | |
6051 Lisp_Object arg; | |
6052 { | |
493 | 6053 if (!NILP (arg)) |
314 | 6054 { |
649
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6055 if (noninteractive) |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6056 putchar (07); |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6057 else |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6058 ring_bell (); |
314 | 6059 fflush (stdout); |
6060 } | |
6061 else | |
6062 bitch_at_user (); | |
6063 | |
6064 return Qnil; | |
6065 } | |
6066 | |
21514 | 6067 void |
314 | 6068 bitch_at_user () |
6069 { | |
6070 if (noninteractive) | |
6071 putchar (07); | |
25012 | 6072 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ |
314 | 6073 error ("Keyboard macro terminated by a command ringing the bell"); |
6074 else | |
6075 ring_bell (); | |
6076 fflush (stdout); | |
6077 } | |
6078 | |
25012 | 6079 |
6080 | |
6081 /*********************************************************************** | |
6082 Sleeping, Waiting | |
6083 ***********************************************************************/ | |
6084 | |
314 | 6085 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
|
6086 "Pause, without updating display, for SECONDS seconds.\n\ |
2648 | 6087 SECONDS may be a floating-point value, meaning that you can wait for a\n\ |
6088 fraction of a second. Optional second arg MILLISECONDS specifies an\n\ | |
6089 additional wait period, in milliseconds; this may be useful if your\n\ | |
6090 Emacs was built without floating point support.\n\ | |
6091 \(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
|
6092 (seconds, milliseconds) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6093 Lisp_Object seconds, milliseconds; |
314 | 6094 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6095 int sec, usec; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6096 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6097 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
|
6098 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
|
6099 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6100 CHECK_NUMBER (milliseconds, 1); |
2648 | 6101 usec = XINT (milliseconds) * 1000; |
6102 | |
6103 { | |
6104 double duration = extract_float (seconds); | |
6105 sec = (int) duration; | |
6106 usec += (duration - sec) * 1000000; | |
6107 } | |
314 | 6108 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6109 #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
|
6110 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
|
6111 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
|
6112 #endif |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6113 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6114 /* 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
|
6115 if (usec < 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6116 { |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6117 /* 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
|
6118 if (-1000000 < usec) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6119 sec--, usec += 1000000; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6120 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6121 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
|
6122 } |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6123 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6124 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
|
6125 |
14646
68fe10d1abd0
(Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents:
14459
diff
changeset
|
6126 if (sec < 0 || (sec == 0 && usec == 0)) |
314 | 6127 return Qnil; |
6128 | |
650 | 6129 { |
6130 Lisp_Object zero; | |
6131 | |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
6132 XSETFASTINT (zero, 0); |
650 | 6133 wait_reading_process_input (sec, usec, zero, 0); |
6134 } | |
587 | 6135 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6136 /* 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
|
6137 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
|
6138 #if 0 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6139 /* No wait_reading_process_input */ |
314 | 6140 immediate_quit = 1; |
6141 QUIT; | |
6142 | |
6143 #ifdef VMS | |
6144 sys_sleep (sec); | |
6145 #else /* not VMS */ | |
6146 /* The reason this is done this way | |
6147 (rather than defined (H_S) && defined (H_T)) | |
6148 is because the VMS preprocessor doesn't grok `defined' */ | |
6149 #ifdef HAVE_SELECT | |
554 | 6150 EMACS_GET_TIME (end_time); |
6151 EMACS_SET_SECS_USECS (timeout, sec, usec); | |
587 | 6152 EMACS_ADD_TIME (end_time, end_time, timeout); |
554 | 6153 |
314 | 6154 while (1) |
6155 { | |
554 | 6156 EMACS_GET_TIME (timeout); |
6157 EMACS_SUB_TIME (timeout, end_time, timeout); | |
6158 if (EMACS_TIME_NEG_P (timeout) | |
6159 || !select (1, 0, 0, 0, &timeout)) | |
314 | 6160 break; |
6161 } | |
6162 #else /* not HAVE_SELECT */ | |
6163 sleep (sec); | |
6164 #endif /* HAVE_SELECT */ | |
6165 #endif /* not VMS */ | |
6166 | |
6167 immediate_quit = 0; | |
6168 #endif /* no subprocesses */ | |
6169 | |
6170 return Qnil; | |
6171 } | |
6172 | |
25012 | 6173 |
650 | 6174 /* This is just like wait_reading_process_input, except that |
6175 it does the redisplay. | |
6176 | |
5223
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
6177 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
|
6178 waiting for input as well. */ |
650 | 6179 |
6180 Lisp_Object | |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6181 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
|
6182 int sec, usec, reading, display, initial_display; |
314 | 6183 { |
650 | 6184 Lisp_Object read_kbd; |
314 | 6185 |
14964
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6186 swallow_events (display); |
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6187 |
14757
99125e1e8bac
(sit_for): Pass DISPLAY to detect_input_pending_run_timers.
Richard M. Stallman <rms@gnu.org>
parents:
14646
diff
changeset
|
6188 if (detect_input_pending_run_timers (display)) |
314 | 6189 return Qnil; |
650 | 6190 |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6191 if (initial_display) |
35336
002c02db42d3
Call redisplay_preserve_echo_area with additional arg.
Gerd Moellmann <gerd@gnu.org>
parents:
35307
diff
changeset
|
6192 redisplay_preserve_echo_area (2); |
314 | 6193 |
673 | 6194 if (sec == 0 && usec == 0) |
6195 return Qt; | |
6196 | |
314 | 6197 #ifdef SIGIO |
1915
98ecf99d7b1a
* dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
1872
diff
changeset
|
6198 gobble_input (0); |
650 | 6199 #endif |
6200 | |
9264
9338a124ea84
(redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents:
8903
diff
changeset
|
6201 XSETINT (read_kbd, reading ? -1 : 1); |
650 | 6202 wait_reading_process_input (sec, usec, read_kbd, display); |
6203 | |
314 | 6204 return detect_input_pending () ? Qnil : Qt; |
6205 } | |
6206 | |
25012 | 6207 |
650 | 6208 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
|
6209 "Perform redisplay, then wait for SECONDS seconds or until input is available.\n\ |
2648 | 6210 SECONDS may be a floating-point value, meaning that you can wait for a\n\ |
6211 fraction of a second. Optional second arg MILLISECONDS specifies an\n\ | |
6212 additional wait period, in milliseconds; this may be useful if your\n\ | |
6213 Emacs was built without floating point support.\n\ | |
6214 \(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
|
6215 Optional third arg NODISP non-nil means don't redisplay, just wait for input.\n\ |
650 | 6216 Redisplay is preempted as always if input arrives, and does not happen\n\ |
6217 if input is available before it starts.\n\ | |
6218 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
|
6219 (seconds, milliseconds, nodisp) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6220 Lisp_Object seconds, milliseconds, nodisp; |
650 | 6221 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6222 int sec, usec; |
650 | 6223 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6224 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
|
6225 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
|
6226 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6227 CHECK_NUMBER (milliseconds, 1); |
2648 | 6228 usec = XINT (milliseconds) * 1000; |
6229 | |
6230 { | |
6231 double duration = extract_float (seconds); | |
6232 sec = (int) duration; | |
6233 usec += (duration - sec) * 1000000; | |
6234 } | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6235 |
650 | 6236 #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
|
6237 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
|
6238 error ("millisecond `sit-for' not supported on %s", SYSTEM_TYPE); |
650 | 6239 #endif |
6240 | |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6241 return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp)); |
650 | 6242 } |
25012 | 6243 |
6244 | |
314 | 6245 |
25012 | 6246 /*********************************************************************** |
6247 Other Lisp Functions | |
6248 ***********************************************************************/ | |
6249 | |
6250 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the | |
6251 session's frames, frame names, buffers, buffer-read-only flags, and | |
6252 buffer-modified-flags, and a trailing sentinel (so we don't need to | |
6253 add length checks). */ | |
6254 | |
6255 static Lisp_Object frame_and_buffer_state; | |
6256 | |
6257 | |
6258 DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p, | |
6259 Sframe_or_buffer_changed_p, 0, 0, 0, | |
6260 "Return non-nil if the frame and buffer state appears to have changed.\n\ | |
6261 The state variable is an internal vector containing all frames and buffers,\n\ | |
6262 aside from buffers whose names start with space,\n\ | |
6263 along with the buffers' read-only and modified flags, which allows a fast\n\ | |
6264 check to see whether the menu bars might need to be recomputed.\n\ | |
6265 If this function returns non-nil, it updates the internal vector to reflect\n\ | |
6266 the current state.\n") | |
6267 () | |
6268 { | |
6269 Lisp_Object tail, frame, buf; | |
6270 Lisp_Object *vecp; | |
6271 int n; | |
6272 | |
6273 vecp = XVECTOR (frame_and_buffer_state)->contents; | |
6274 FOR_EACH_FRAME (tail, frame) | |
6275 { | |
6276 if (!EQ (*vecp++, frame)) | |
6277 goto changed; | |
6278 if (!EQ (*vecp++, XFRAME (frame)->name)) | |
6279 goto changed; | |
6280 } | |
6281 /* Check that the buffer info matches. | |
6282 No need to test for the end of the vector | |
6283 because the last element of the vector is lambda | |
6284 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
|
6285 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6286 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6287 buf = XCDR (XCAR (tail)); |
25012 | 6288 /* Ignore buffers that aren't included in buffer lists. */ |
6289 if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') | |
6290 continue; | |
6291 if (!EQ (*vecp++, buf)) | |
6292 goto changed; | |
6293 if (!EQ (*vecp++, XBUFFER (buf)->read_only)) | |
6294 goto changed; | |
6295 if (!EQ (*vecp++, Fbuffer_modified_p (buf))) | |
6296 goto changed; | |
6297 } | |
6298 /* Detect deletion of a buffer at the end of the list. */ | |
6299 if (EQ (*vecp, Qlambda)) | |
6300 return Qnil; | |
6301 changed: | |
6302 /* Start with 1 so there is room for at least one lambda at the end. */ | |
6303 n = 1; | |
6304 FOR_EACH_FRAME (tail, frame) | |
6305 n += 2; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6306 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6307 n += 3; |
6308 /* Reallocate the vector if it's grown, or if it's shrunk a lot. */ | |
6309 if (n > XVECTOR (frame_and_buffer_state)->size | |
6310 || n + 20 < XVECTOR (frame_and_buffer_state)->size / 2) | |
6311 /* Add 20 extra so we grow it less often. */ | |
6312 frame_and_buffer_state = Fmake_vector (make_number (n + 20), Qlambda); | |
6313 vecp = XVECTOR (frame_and_buffer_state)->contents; | |
6314 FOR_EACH_FRAME (tail, frame) | |
6315 { | |
6316 *vecp++ = frame; | |
6317 *vecp++ = XFRAME (frame)->name; | |
6318 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6319 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6320 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6321 buf = XCDR (XCAR (tail)); |
25012 | 6322 /* Ignore buffers that aren't included in buffer lists. */ |
6323 if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') | |
6324 continue; | |
6325 *vecp++ = buf; | |
6326 *vecp++ = XBUFFER (buf)->read_only; | |
6327 *vecp++ = Fbuffer_modified_p (buf); | |
6328 } | |
6329 /* Fill up the vector with lambdas (always at least one). */ | |
6330 *vecp++ = Qlambda; | |
6331 while (vecp - XVECTOR (frame_and_buffer_state)->contents | |
6332 < XVECTOR (frame_and_buffer_state)->size) | |
6333 *vecp++ = Qlambda; | |
6334 /* Make sure we didn't overflow the vector. */ | |
6335 if (vecp - XVECTOR (frame_and_buffer_state)->contents | |
6336 > XVECTOR (frame_and_buffer_state)->size) | |
6337 abort (); | |
6338 return Qt; | |
6339 } | |
6340 | |
6341 | |
6342 | |
6343 /*********************************************************************** | |
6344 Initialization | |
6345 ***********************************************************************/ | |
6346 | |
314 | 6347 char *terminal_type; |
6348 | |
25012 | 6349 /* Initialization done when Emacs fork is started, before doing stty. |
6350 Determine terminal type and set terminal_driver. Then invoke its | |
6351 decoding routine to set up variables in the terminal package. */ | |
314 | 6352 |
21514 | 6353 void |
314 | 6354 init_display () |
6355 { | |
6356 #ifdef HAVE_X_WINDOWS | |
6357 extern int display_arg; | |
6358 #endif | |
6359 | |
25012 | 6360 /* Construct the space glyph. */ |
6361 space_glyph.type = CHAR_GLYPH; | |
6362 SET_CHAR_GLYPH_FROM_GLYPH (space_glyph, ' '); | |
6363 space_glyph.charpos = -1; | |
6364 | |
314 | 6365 meta_key = 0; |
6366 inverse_video = 0; | |
6367 cursor_in_echo_area = 0; | |
6368 terminal_type = (char *) 0; | |
6369 | |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6370 /* 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
|
6371 during startup. */ |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6372 Vwindow_system = Qnil; |
314 | 6373 |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6374 /* 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
|
6375 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
|
6376 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
|
6377 using the window system. |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6378 |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6379 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
|
6380 try to use X, and die with an error message if that doesn't work. */ |
314 | 6381 |
6382 #ifdef HAVE_X_WINDOWS | |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6383 if (! display_arg) |
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6384 { |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6385 char *display; |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6386 #ifdef VMS |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6387 display = getenv ("DECW$DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6388 #else |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6389 display = getenv ("DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6390 #endif |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6391 |
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6392 display_arg = (display != 0 && *display != 0); |
2364 | 6393 } |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6394 |
18774
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6395 if (!inhibit_window_system && display_arg |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6396 #ifndef CANNOT_DUMP |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6397 && initialized |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6398 #endif |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6399 ) |
314 | 6400 { |
6401 Vwindow_system = intern ("x"); | |
6402 #ifdef HAVE_X11 | |
6403 Vwindow_system_version = make_number (11); | |
6404 #else | |
6405 Vwindow_system_version = make_number (10); | |
6406 #endif | |
15273
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6407 #if defined (LINUX) && defined (HAVE_LIBNCURSES) |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6408 /* In some versions of ncurses, |
15282 | 6409 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
|
6410 So call tgetent. */ |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6411 { char b[2044]; tgetent (b, "xterm");} |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6412 #endif |
25012 | 6413 adjust_frame_glyphs_initially (); |
314 | 6414 return; |
6415 } | |
6416 #endif /* HAVE_X_WINDOWS */ | |
6417 | |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6418 #ifdef HAVE_NTGUI |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6419 if (!inhibit_window_system) |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6420 { |
16589
ec300a10e407
(init_display) [HAVE_NTGUI]: Use w32 for window-system.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16412
diff
changeset
|
6421 Vwindow_system = intern ("w32"); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6422 Vwindow_system_version = make_number (1); |
25012 | 6423 adjust_frame_glyphs_initially (); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6424 return; |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6425 } |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6426 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6427 |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6428 #ifdef macintosh |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6429 if (!inhibit_window_system) |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6430 { |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6431 Vwindow_system = intern ("mac"); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6432 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
|
6433 adjust_frame_glyphs_initially (); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6434 return; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6435 } |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6436 #endif /* macintosh */ |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6437 |
314 | 6438 /* If no window system has been specified, try to use the terminal. */ |
6439 if (! isatty (0)) | |
6440 { | |
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
6441 fatal ("standard input is not a tty"); |
314 | 6442 exit (1); |
6443 } | |
6444 | |
6445 /* Look at the TERM variable */ | |
6446 terminal_type = (char *) getenv ("TERM"); | |
6447 if (!terminal_type) | |
6448 { | |
6449 #ifdef VMS | |
6450 fprintf (stderr, "Please specify your terminal type.\n\ | |
6451 For types defined in VMS, use set term /device=TYPE.\n\ | |
6452 For types not defined in VMS, use define emacs_term \"TYPE\".\n\ | |
6453 \(The quotation marks are necessary since terminal types are lower case.)\n"); | |
6454 #else | |
6455 fprintf (stderr, "Please set the environment variable TERM; see tset(1).\n"); | |
6456 #endif | |
6457 exit (1); | |
6458 } | |
6459 | |
6460 #ifdef VMS | |
25012 | 6461 /* VMS DCL tends to up-case things, so down-case term type. |
314 | 6462 Hardly any uppercase letters in terminal types; should be none. */ |
6463 { | |
6464 char *new = (char *) xmalloc (strlen (terminal_type) + 1); | |
6465 char *p; | |
6466 | |
6467 strcpy (new, terminal_type); | |
6468 | |
6469 for (p = new; *p; p++) | |
6470 if (isupper (*p)) | |
6471 *p = tolower (*p); | |
6472 | |
6473 terminal_type = new; | |
6474 } | |
25012 | 6475 #endif /* VMS */ |
314 | 6476 |
6477 term_init (terminal_type); | |
25012 | 6478 |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6479 { |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6480 struct frame *sf = SELECTED_FRAME (); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6481 int width = FRAME_WINDOW_WIDTH (sf); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6482 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
|
6483 |
25012 | 6484 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph); |
6485 | |
6486 /* If these sizes are so big they cause overflow, just ignore the | |
6487 change. It's not clear what better we could do. */ | |
6488 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
|
6489 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
|
6490 } |
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6491 |
25012 | 6492 adjust_frame_glyphs_initially (); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6493 calculate_costs (XFRAME (selected_frame)); |
314 | 6494 |
6495 #ifdef SIGWINCH | |
6496 #ifndef CANNOT_DUMP | |
6497 if (initialized) | |
6498 #endif /* CANNOT_DUMP */ | |
6499 signal (SIGWINCH, window_change_signal); | |
6500 #endif /* SIGWINCH */ | |
25012 | 6501 |
6502 /* Set up faces of the initial terminal frame of a dumped Emacs. */ | |
6503 if (initialized | |
6504 && !noninteractive | |
25118
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6505 #ifdef MSDOS |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6506 /* 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
|
6507 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
|
6508 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
|
6509 and internal_terminal_init. */ |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6510 && (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
|
6511 #endif |
25012 | 6512 && NILP (Vwindow_system)) |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6513 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6514 /* 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
|
6515 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
|
6516 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
|
6517 |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
6518 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
|
6519 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
|
6520 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
|
6521 } |
314 | 6522 } |
25012 | 6523 |
6524 | |
314 | 6525 |
25012 | 6526 /*********************************************************************** |
6527 Blinking cursor | |
6528 ***********************************************************************/ | |
6529 | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6530 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
|
6531 Sinternal_show_cursor, 2, 2, 0, |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6532 "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
|
6533 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
|
6534 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
|
6535 don't show a cursor.") |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6536 (window, show) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6537 Lisp_Object window, show; |
25012 | 6538 { |
6539 /* Don't change cursor state while redisplaying. This could confuse | |
6540 output routines. */ | |
6541 if (!redisplaying_p) | |
6542 { | |
6543 if (NILP (window)) | |
6544 window = selected_window; | |
6545 else | |
6546 CHECK_WINDOW (window, 2); | |
6547 | |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6548 XWINDOW (window)->cursor_off_p = NILP (show); |
25012 | 6549 } |
6550 | |
6551 return Qnil; | |
6552 } | |
6553 | |
6554 | |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6555 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
|
6556 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
|
6557 "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
|
6558 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
|
6559 (window) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6560 Lisp_Object window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6561 { |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6562 struct window *w; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6563 |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6564 if (NILP (window)) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6565 window = selected_window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6566 else |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6567 CHECK_WINDOW (window, 2); |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6568 |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6569 w = XWINDOW (window); |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6570 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
|
6571 } |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6572 |
25012 | 6573 |
6574 /*********************************************************************** | |
6575 Initialization | |
6576 ***********************************************************************/ | |
6577 | |
21514 | 6578 void |
314 | 6579 syms_of_display () |
6580 { | |
764 | 6581 defsubr (&Sredraw_frame); |
314 | 6582 defsubr (&Sredraw_display); |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6583 defsubr (&Sframe_or_buffer_changed_p); |
314 | 6584 defsubr (&Sopen_termscript); |
6585 defsubr (&Sding); | |
6586 defsubr (&Ssit_for); | |
6587 defsubr (&Ssleep_for); | |
6588 defsubr (&Ssend_string_to_terminal); | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6589 defsubr (&Sinternal_show_cursor); |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6590 defsubr (&Sinternal_show_cursor_p); |
314 | 6591 |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
6592 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6593 defsubr (&Sdump_redisplay_history); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6594 #endif |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6595 |
12186
6811992e871c
(Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents:
11919
diff
changeset
|
6596 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
|
6597 staticpro (&frame_and_buffer_state); |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6598 |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6599 Qdisplay_table = intern ("display-table"); |
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6600 staticpro (&Qdisplay_table); |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6601 Qredisplay_dont_pause = intern ("redisplay-dont-pause"); |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6602 staticpro (&Qredisplay_dont_pause); |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6603 |
314 | 6604 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
|
6605 "*The output baud rate of the terminal.\n\ |
314 | 6606 On most systems, changing this value will affect the amount of padding\n\ |
6607 and the other strategic decisions made during redisplay."); | |
25012 | 6608 |
314 | 6609 DEFVAR_BOOL ("inverse-video", &inverse_video, |
764 | 6610 "*Non-nil means invert the entire frame display.\n\ |
314 | 6611 This means everything is in inverse video which otherwise would not be."); |
25012 | 6612 |
314 | 6613 DEFVAR_BOOL ("visible-bell", &visible_bell, |
764 | 6614 "*Non-nil means try to flash the frame to represent a bell."); |
25012 | 6615 |
314 | 6616 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, |
764 | 6617 "*Non-nil means no need to redraw entire frame after suspending.\n\ |
314 | 6618 A non-nil value is useful if the terminal can automatically preserve\n\ |
764 | 6619 Emacs's frame display when you reenter Emacs.\n\ |
314 | 6620 It is up to you to set this variable if your terminal can do that."); |
25012 | 6621 |
314 | 6622 DEFVAR_LISP ("window-system", &Vwindow_system, |
6623 "A symbol naming the window-system under which Emacs is running\n\ | |
6624 \(such as `x'), or nil if emacs is running on an ordinary terminal."); | |
25012 | 6625 |
314 | 6626 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, |
6627 "The version number of the window system in use.\n\ | |
6628 For X windows, this is 10 or 11."); | |
25012 | 6629 |
314 | 6630 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, |
6631 "Non-nil means put cursor in minibuffer, at end of any message there."); | |
25012 | 6632 |
314 | 6633 DEFVAR_LISP ("glyph-table", &Vglyph_table, |
764 | 6634 "Table defining how to output a glyph code to the frame.\n\ |
314 | 6635 If not nil, this is a vector indexed by glyph code to define the glyph.\n\ |
6636 Each element can be:\n\ | |
6637 integer: a glyph code which this glyph is an alias for.\n\ | |
6638 string: output this glyph using that string (not impl. in X windows).\n\ | |
36590
a7e858c0a674
(syms_of_display) <glyph-table>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36392
diff
changeset
|
6639 nil: this glyph mod 524288 is the code of a character to output,\n\ |
a7e858c0a674
(syms_of_display) <glyph-table>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36392
diff
changeset
|
6640 and this glyph / 524288 is the face number (see `face-id') to use\n\ |
a7e858c0a674
(syms_of_display) <glyph-table>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36392
diff
changeset
|
6641 while outputting it."); |
314 | 6642 Vglyph_table = Qnil; |
6643 | |
6644 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table, | |
6645 "Display table to use for buffers that specify none.\n\ | |
6646 See `buffer-display-table' for more information."); | |
6647 Vstandard_display_table = Qnil; | |
6648 | |
25012 | 6649 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause, |
6650 "*Non-nil means update isn't paused when input is detected."); | |
6651 redisplay_dont_pause = 0; | |
6652 | |
314 | 6653 /* Initialize `window-system', unless init_display already decided it. */ |
6654 #ifdef CANNOT_DUMP | |
6655 if (noninteractive) | |
6656 #endif | |
6657 { | |
6658 Vwindow_system = Qnil; | |
6659 Vwindow_system_version = Qnil; | |
6660 } | |
6661 } |