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