Mercurial > emacs
annotate src/dispnew.c @ 70874:acd53b4b2285
(fn_keycode_to_keycode_table, XTread_socket) [MAC_OSX]:
Fix last change. Don't map `fn' modifier if pressed with F1 ... F12.
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
---|---|
date | Wed, 24 May 2006 08:08:43 +0000 |
parents | c39f344060aa |
children | 5cf77229c85d d9f8d2a65d18 2ecafc6d5db7 |
rev | line source |
---|---|
314 | 1 /* Updating of data structures for redisplay. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, |
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
3 1997, 1998, 1999, 2000, 2001, 2002, 2003, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
65905
diff
changeset
|
4 2004, 2005, 2006 Free Software Foundation, Inc. |
314 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
8 GNU Emacs is free software; you can redistribute it and/or modify | |
9 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
|
10 the Free Software Foundation; either version 2, or (at your option) |
314 | 11 any later version. |
12 | |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02110-1301, USA. */ | |
314 | 22 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
23 #include <config.h> |
314 | 24 #include <signal.h> |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7814
diff
changeset
|
25 #include <stdio.h> |
314 | 26 #include <ctype.h> |
27 | |
21514 | 28 #ifdef HAVE_UNISTD_H |
29 #include <unistd.h> | |
30 #endif | |
31 | |
3525
58e789baa27a
Include lisp.h earlier (before termhooks.h).
Richard M. Stallman <rms@gnu.org>
parents:
3517
diff
changeset
|
32 #include "lisp.h" |
314 | 33 #include "termchar.h" |
34 #include "termopts.h" | |
2198 | 35 #include "termhooks.h" |
13526
34382f4e23cb
Always include dispextern.h before cm.h.
Richard M. Stallman <rms@gnu.org>
parents:
13448
diff
changeset
|
36 /* 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
|
37 #include "dispextern.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
38 #include "cm.h" |
314 | 39 #include "buffer.h" |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
40 #include "charset.h" |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
41 #include "keyboard.h" |
764 | 42 #include "frame.h" |
314 | 43 #include "window.h" |
44 #include "commands.h" | |
45 #include "disptab.h" | |
46 #include "indent.h" | |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
47 #include "intervals.h" |
15065 | 48 #include "blockinput.h" |
21514 | 49 #include "process.h" |
314 | 50 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
51 /* 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
|
52 include the following file. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
53 /* #include "systty.h" */ |
12917 | 54 #include "syssignal.h" |
554 | 55 |
314 | 56 #ifdef HAVE_X_WINDOWS |
57 #include "xterm.h" | |
25012 | 58 #endif /* HAVE_X_WINDOWS */ |
314 | 59 |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
60 #ifdef HAVE_NTGUI |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
61 #include "w32term.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
62 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
63 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
64 #ifdef MAC_OS |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
65 #include "macterm.h" |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
66 #endif /* MAC_OS */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
67 |
25012 | 68 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ |
69 | |
7808
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
70 #include "systime.h" |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
71 #include <errno.h> |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
72 |
25012 | 73 /* To get the prototype for `sleep'. */ |
74 | |
75 #ifdef HAVE_UNISTD_H | |
76 #include <unistd.h> | |
77 #endif | |
78 | |
314 | 79 /* Get number of chars of output now in the buffer of a stdio stream. |
25012 | 80 This ought to be built in in stdio, but it isn't. Some s- files |
81 override this because their stdio internals differ. */ | |
82 | |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
83 #ifdef __GNU_LIBRARY__ |
25012 | 84 |
85 /* The s- file might have overridden the definition with one that | |
86 works for the system's C library. But we are using the GNU C | |
87 library, so this is the right definition for every system. */ | |
88 | |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
89 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
90 #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
|
91 #else |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
92 #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
|
93 #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
|
94 #endif |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
95 #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
|
96 #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
|
97 #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
|
98 #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
|
99 #endif |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
100 #ifndef PENDING_OUTPUT_COUNT |
314 | 101 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) |
102 #endif | |
25012 | 103 #endif /* not __GNU_LIBRARY__ */ |
104 | |
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
105 #if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) |
29437 | 106 #include <term.h> /* for tgetent */ |
107 #endif | |
25012 | 108 |
109 /* Structure to pass dimensions around. Used for character bounding | |
110 boxes, glyph matrix dimensions and alike. */ | |
111 | |
112 struct dim | |
113 { | |
114 int width; | |
115 int height; | |
116 }; | |
117 | |
118 | |
119 /* Function prototypes. */ | |
120 | |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
121 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
|
122 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
|
123 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
|
124 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
|
125 static void redraw_overlapped_rows P_ ((struct window *, int)); |
25012 | 126 static int count_blanks P_ ((struct glyph *, int)); |
127 static int count_match P_ ((struct glyph *, struct glyph *, | |
128 struct glyph *, struct glyph *)); | |
129 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int)); | |
130 static void update_frame_line P_ ((struct frame *, int)); | |
131 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
|
132 P_ ((Lisp_Object, int, int, int, int *)); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
133 static void allocate_matrices_for_window_redisplay P_ ((struct window *)); |
25012 | 134 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim)); |
135 static void adjust_frame_glyphs P_ ((struct frame *)); | |
136 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *)); | |
137 static void free_glyph_matrix P_ ((struct glyph_matrix *)); | |
138 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *, | |
139 int, int, struct dim)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
140 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); |
25012 | 141 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
|
142 #if GLYPH_DEBUG |
25012 | 143 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
|
144 #endif |
25012 | 145 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); |
146 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *, | |
147 struct window *)); | |
148 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *, | |
149 struct window *)); | |
150 static struct glyph_pool *new_glyph_pool P_ ((void)); | |
151 static void free_glyph_pool P_ ((struct glyph_pool *)); | |
152 static void adjust_frame_glyphs_initially P_ ((void)); | |
153 static void adjust_frame_message_buffer P_ ((struct frame *)); | |
154 static void adjust_decode_mode_spec_buffer P_ ((struct frame *)); | |
155 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *)); | |
156 static void build_frame_matrix P_ ((struct frame *)); | |
157 void clear_current_matrices P_ ((struct frame *)); | |
158 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int, | |
159 int, int)); | |
160 static void clear_window_matrices P_ ((struct window *, int)); | |
161 static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int)); | |
162 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
|
163 static int update_window_line P_ ((struct window *, int, int *)); |
25012 | 164 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
|
165 static int update_text_area P_ ((struct window *, int)); |
25012 | 166 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *, |
167 int)); | |
168 static void mirror_make_current P_ ((struct window *, int)); | |
169 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
|
170 #if GLYPH_DEBUG |
25012 | 171 static void check_matrix_pointers P_ ((struct glyph_matrix *, |
172 struct glyph_matrix *)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
173 #endif |
25012 | 174 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *)); |
175 static int update_window_tree P_ ((struct window *, int)); | |
176 static int update_window P_ ((struct window *, int)); | |
177 static int update_frame_1 P_ ((struct frame *, int, int)); | |
178 static void set_window_cursor_after_update P_ ((struct window *)); | |
179 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
|
180 struct glyph_row *, int)); |
25012 | 181 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *)); |
182 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *)); | |
183 static void reverse_rows P_ ((struct glyph_matrix *, int, int)); | |
184 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
|
185 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
|
186 struct window *frame_row_to_window P_ ((struct window *, int)); |
25012 | 187 |
188 | |
189 /* Non-zero means don't pause redisplay for pending input. (This is | |
190 for debugging and for a future implementation of EDT-like | |
191 scrolling. */ | |
192 | |
193 int redisplay_dont_pause; | |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
194 |
554 | 195 /* Nonzero upon entry to redisplay means do not assume anything about |
764 | 196 current contents of actual terminal frame; clear and redraw it. */ |
314 | 197 |
764 | 198 int frame_garbaged; |
314 | 199 |
25012 | 200 /* Nonzero means last display completed. Zero means it was preempted. */ |
314 | 201 |
202 int display_completed; | |
203 | |
25012 | 204 /* Lisp variable visible-bell; enables use of screen-flash instead of |
205 audible bell. */ | |
314 | 206 |
207 int visible_bell; | |
208 | |
764 | 209 /* Invert the color of the whole frame, at a low level. */ |
314 | 210 |
211 int inverse_video; | |
212 | |
213 /* Line speed of the terminal. */ | |
214 | |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42835
diff
changeset
|
215 EMACS_INT baud_rate; |
314 | 216 |
25012 | 217 /* Either nil or a symbol naming the window system under which Emacs |
218 is running. */ | |
314 | 219 |
220 Lisp_Object Vwindow_system; | |
221 | |
222 /* Version number of X windows: 10, 11 or nil. */ | |
25012 | 223 |
314 | 224 Lisp_Object Vwindow_system_version; |
225 | |
25012 | 226 /* Vector of glyph definitions. Indexed by glyph number, the contents |
227 are a string which is how to output the glyph. | |
314 | 228 |
229 If Vglyph_table is nil, a glyph is output by using its low 8 bits | |
25012 | 230 as a character code. |
231 | |
232 This is an obsolete feature that is no longer used. The variable | |
233 is retained for compatibility. */ | |
314 | 234 |
235 Lisp_Object Vglyph_table; | |
236 | |
237 /* Display table to use for vectors that don't specify their own. */ | |
238 | |
239 Lisp_Object Vstandard_display_table; | |
240 | |
25012 | 241 /* Nonzero means reading single-character input with prompt so put |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
242 cursor on mini-buffer after the prompt. Positive means at end of |
25012 | 243 text in echo area; negative means at beginning of line. */ |
244 | |
314 | 245 int cursor_in_echo_area; |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
246 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
247 Lisp_Object Qdisplay_table, Qredisplay_dont_pause; |
25012 | 248 |
314 | 249 |
25012 | 250 /* 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
|
251 variable always equals the_only_frame. */ |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
252 |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
253 Lisp_Object selected_frame; |
25012 | 254 |
255 /* A frame which is not just a mini-buffer, or 0 if there are no such | |
764 | 256 frames. This is usually the most recent such frame that was |
9572 | 257 selected. In a single-frame version, this variable always holds |
258 the address of the_only_frame. */ | |
25012 | 259 |
260 struct frame *last_nonminibuf_frame; | |
261 | |
262 /* Stdio stream being used for copy of all output. */ | |
263 | |
264 FILE *termscript; | |
265 | |
266 /* Structure for info on cursor positioning. */ | |
267 | |
268 struct cm Wcm; | |
269 | |
270 /* 1 means SIGWINCH happened when not safe. */ | |
271 | |
272 int delayed_size_change; | |
273 | |
274 /* 1 means glyph initialization has been completed at startup. */ | |
275 | |
276 static int glyphs_initialized_initially_p; | |
277 | |
278 /* Updated window if != 0. Set by update_window. */ | |
279 | |
280 struct window *updated_window; | |
281 | |
282 /* Glyph row updated in update_window_line, and area that is updated. */ | |
283 | |
284 struct glyph_row *updated_row; | |
285 int updated_area; | |
286 | |
287 /* A glyph for a space. */ | |
288 | |
289 struct glyph space_glyph; | |
290 | |
291 /* Non-zero means update has been performed directly, so that there's | |
292 no need for redisplay_internal to do much work. Set by | |
293 direct_output_for_insert. */ | |
294 | |
295 int redisplay_performed_directly_p; | |
296 | |
297 /* Counts of allocated structures. These counts serve to diagnose | |
298 memory leaks and double frees. */ | |
299 | |
300 int glyph_matrix_count; | |
301 int glyph_pool_count; | |
302 | |
303 /* If non-null, the frame whose frame matrices are manipulated. If | |
304 null, window matrices are worked on. */ | |
305 | |
306 static struct frame *frame_matrix_frame; | |
307 | |
308 /* Current interface for window-based redisplay. Set from init_xterm. | |
309 A null value means we are not using window-based redisplay. */ | |
310 | |
311 struct redisplay_interface *rif; | |
312 | |
313 /* Non-zero means that fonts have been loaded since the last glyph | |
314 matrix adjustments. Redisplay must stop, and glyph matrices must | |
315 be adjusted when this flag becomes non-zero during display. The | |
316 reason fonts can be loaded so late is that fonts of fontsets are | |
317 loaded on demand. */ | |
318 | |
319 int fonts_changed_p; | |
320 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
321 /* Convert vpos and hpos from frame to window and vice versa. |
25012 | 322 This may only be used for terminal frames. */ |
323 | |
324 #if GLYPH_DEBUG | |
325 | |
326 static int window_to_frame_vpos P_ ((struct window *, int)); | |
327 static int window_to_frame_hpos P_ ((struct window *, int)); | |
328 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) | |
329 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) | |
330 | |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
331 /* 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
|
332 information. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
333 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
334 struct redisplay_history |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
335 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
336 char trace[512 + 100]; |
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 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
339 /* The size of the history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
340 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
341 #define REDISPLAY_HISTORY_SIZE 30 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
342 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
343 /* The redisplay history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
344 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
345 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
|
346 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
347 /* Next free entry in redisplay_history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
348 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
349 static int history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
350 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
351 /* 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
|
352 history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
353 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
354 static unsigned history_tick; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
355 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
356 static 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
|
357 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
|
358 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
359 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
360 /* 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
|
361 MSG is a trace containing the information how W's glyph matrix |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
362 has been constructed. PAUSED_P non-zero means that the update |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
363 has been interrupted for pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
364 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
365 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
366 add_window_display_history (w, msg, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
367 struct window *w; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
368 char *msg; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
369 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
370 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
371 char *buf; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
372 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
373 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
374 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
375 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
376 ++history_idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
377 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
378 sprintf (buf, "%d: window %p (`%s')%s\n", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
379 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
380 w, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
381 ((BUFFERP (w->buffer) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
382 && STRINGP (XBUFFER (w->buffer)->name)) |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
383 ? (char *) SDATA (XBUFFER (w->buffer)->name) |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
384 : "???"), |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
385 paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
386 strcat (buf, msg); |
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 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
390 /* 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
|
391 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
|
392 pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
393 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
394 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
395 add_frame_display_history (f, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
396 struct frame *f; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
397 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
398 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
399 char *buf; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
400 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
401 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
402 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
403 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
404 ++history_idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
405 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
406 sprintf (buf, "%d: update frame %p%s", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
407 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
408 f, paused_p ? " ***paused***" : ""); |
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 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
412 DEFUN ("dump-redisplay-history", Fdump_redisplay_history, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
413 Sdump_redisplay_history, 0, 0, "", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
414 doc: /* Dump redisplay history to stderr. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
415 () |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
416 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
417 int i; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
418 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
419 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
|
420 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
421 if (i < 0) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
422 i = REDISPLAY_HISTORY_SIZE - 1; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
423 fprintf (stderr, "%s\n", redisplay_history[i].trace); |
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 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
426 return Qnil; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
427 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
428 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
429 |
25012 | 430 #else /* GLYPH_DEBUG == 0 */ |
431 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
432 #define WINDOW_TO_FRAME_VPOS(W, VPOS) ((VPOS) + WINDOW_TOP_EDGE_LINE (W)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
433 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + WINDOW_LEFT_EDGE_COL (W)) |
25012 | 434 |
435 #endif /* GLYPH_DEBUG == 0 */ | |
436 | |
437 | |
438 /* Like bcopy except never gets confused by overlap. Let this be the | |
439 first function defined in this file, or change emacs.c where the | |
440 address of this function is used. */ | |
314 | 441 |
442 void | |
443 safe_bcopy (from, to, size) | |
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
444 const char *from; |
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
445 char *to; |
314 | 446 int size; |
447 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
448 if (size <= 0 || from == to) |
314 | 449 return; |
450 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
451 /* 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
|
452 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
|
453 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
|
454 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
|
455 bcopy (from, to, size); |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
456 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
457 /* 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
|
458 else |
314 | 459 { |
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
460 register const char *endf = from + size; |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
461 register char *endt = to + size; |
314 | 462 |
463 /* If TO - FROM is large, then we should break the copy into | |
464 nonoverlapping chunks of TO - FROM bytes each. However, if | |
465 TO - FROM is small, then the bcopy function call overhead | |
466 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
|
467 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
|
468 bad, I'm trying to err in its favor. */ |
314 | 469 if (to - from < 64) |
470 { | |
471 do | |
472 *--endt = *--endf; | |
473 while (endf != from); | |
474 } | |
475 else | |
476 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
477 for (;;) |
314 | 478 { |
479 endt -= (to - from); | |
480 endf -= (to - from); | |
481 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
482 if (endt < to) |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
483 break; |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
484 |
314 | 485 bcopy (endf, endt, to - from); |
486 } | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
487 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
488 /* If SIZE wasn't a multiple of TO - FROM, there will be a |
25012 | 489 little left over. The amount left over is (endt + (to - |
490 from)) - to, which is endt - from. */ | |
314 | 491 bcopy (from, to, endt - from); |
492 } | |
493 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
494 } |
314 | 495 |
25012 | 496 |
497 | |
498 /*********************************************************************** | |
499 Glyph Matrices | |
500 ***********************************************************************/ | |
501 | |
502 /* Allocate and return a glyph_matrix structure. POOL is the glyph | |
503 pool from which memory for the matrix should be allocated, or null | |
504 for window-based redisplay where no glyph pools are used. The | |
505 member `pool' of the glyph matrix structure returned is set to | |
506 POOL, the structure is otherwise zeroed. */ | |
507 | |
508 struct glyph_matrix * | |
509 new_glyph_matrix (pool) | |
510 struct glyph_pool *pool; | |
511 { | |
512 struct glyph_matrix *result; | |
513 | |
514 /* Allocate and clear. */ | |
515 result = (struct glyph_matrix *) xmalloc (sizeof *result); | |
516 bzero (result, sizeof *result); | |
517 | |
518 /* Increment number of allocated matrices. This count is used | |
519 to detect memory leaks. */ | |
520 ++glyph_matrix_count; | |
521 | |
522 /* Set pool and return. */ | |
523 result->pool = pool; | |
524 return result; | |
525 } | |
526 | |
527 | |
528 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed. | |
529 | |
530 The global counter glyph_matrix_count is decremented when a matrix | |
531 is freed. If the count gets negative, more structures were freed | |
532 than allocated, i.e. one matrix was freed more than once or a bogus | |
533 pointer was passed to this function. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
534 |
25012 | 535 If MATRIX->pool is null, this means that the matrix manages its own |
536 glyph memory---this is done for matrices on X frames. Freeing the | |
537 matrix also frees the glyph memory in this case. */ | |
538 | |
539 static void | |
540 free_glyph_matrix (matrix) | |
541 struct glyph_matrix *matrix; | |
542 { | |
543 if (matrix) | |
544 { | |
545 int i; | |
546 | |
547 /* Detect the case that more matrices are freed than were | |
548 allocated. */ | |
549 if (--glyph_matrix_count < 0) | |
550 abort (); | |
551 | |
552 /* Free glyph memory if MATRIX owns it. */ | |
553 if (matrix->pool == NULL) | |
554 for (i = 0; i < matrix->rows_allocated; ++i) | |
555 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
556 |
25012 | 557 /* Free row structures and the matrix itself. */ |
558 xfree (matrix->rows); | |
559 xfree (matrix); | |
560 } | |
561 } | |
562 | |
563 | |
564 /* Return the number of glyphs to reserve for a marginal area of | |
565 window W. TOTAL_GLYPHS is the number of glyphs in a complete | |
566 display line of window W. MARGIN gives the width of the marginal | |
567 area in canonical character units. MARGIN should be an integer | |
568 or a float. */ | |
569 | |
570 static int | |
571 margin_glyphs_to_reserve (w, total_glyphs, margin) | |
572 struct window *w; | |
573 int total_glyphs; | |
574 Lisp_Object margin; | |
575 { | |
576 int n; | |
577 | |
578 if (NUMBERP (margin)) | |
579 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
580 int width = XFASTINT (w->total_cols); |
25012 | 581 double d = max (0, XFLOATINT (margin)); |
582 d = min (width / 2 - 1, d); | |
57808
a1c4ff636947
(margin_glyphs_to_reserve): Don't use ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
56727
diff
changeset
|
583 n = (int) ((double) total_glyphs / width * d); |
25012 | 584 } |
585 else | |
586 n = 0; | |
587 | |
588 return n; | |
589 } | |
590 | |
591 | |
592 /* Adjust glyph matrix MATRIX on window W or on a frame to changed | |
593 window sizes. | |
594 | |
595 W is null if the function is called for a frame glyph matrix. | |
596 Otherwise it is the window MATRIX is a member of. X and Y are the | |
597 indices of the first column and row of MATRIX within the frame | |
598 matrix, if such a matrix exists. They are zero for purely | |
599 window-based redisplay. DIM is the needed size of the matrix. | |
600 | |
601 In window-based redisplay, where no frame matrices exist, glyph | |
602 matrices manage their own glyph storage. Otherwise, they allocate | |
603 storage from a common frame glyph pool which can be found in | |
604 MATRIX->pool. | |
605 | |
606 The reason for this memory management strategy is to avoid complete | |
607 frame redraws if possible. When we allocate from a common pool, a | |
608 change of the location or size of a sub-matrix within the pool | |
609 requires a complete redisplay of the frame because we cannot easily | |
610 make sure that the current matrices of all windows still agree with | |
611 what is displayed on the screen. While this is usually fast, it | |
612 leads to screen flickering. */ | |
613 | |
614 static void | |
615 adjust_glyph_matrix (w, matrix, x, y, dim) | |
616 struct window *w; | |
617 struct glyph_matrix *matrix; | |
618 int x, y; | |
619 struct dim dim; | |
620 { | |
621 int i; | |
622 int new_rows; | |
623 int marginal_areas_changed_p = 0; | |
25546 | 624 int header_line_changed_p = 0; |
625 int header_line_p = 0; | |
25012 | 626 int left = -1, right = -1; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
627 int window_width = -1, window_height; |
25012 | 628 |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
629 /* See if W had a header line that has disappeared now, or vice versa. |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
630 Get W's size. */ |
25012 | 631 if (w) |
632 { | |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
633 window_box (w, -1, 0, 0, &window_width, &window_height); |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
634 |
25546 | 635 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
636 header_line_changed_p = header_line_p != matrix->header_line_p; | |
25012 | 637 } |
25546 | 638 matrix->header_line_p = header_line_p; |
25012 | 639 |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
640 /* If POOL is null, MATRIX is a window matrix for window-based redisplay. |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
641 Do nothing if MATRIX' size, position, vscroll, and marginal areas |
25012 | 642 haven't changed. This optimization is important because preserving |
643 the matrix means preventing redisplay. */ | |
644 if (matrix->pool == NULL) | |
645 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
646 left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
647 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols); |
25012 | 648 xassert (left >= 0 && right >= 0); |
649 marginal_areas_changed_p = (left != matrix->left_margin_glyphs | |
650 || right != matrix->right_margin_glyphs); | |
651 | |
652 if (!marginal_areas_changed_p | |
653 && !fonts_changed_p | |
25546 | 654 && !header_line_changed_p |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
655 && matrix->window_left_col == WINDOW_LEFT_EDGE_COL (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
656 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w) |
25012 | 657 && matrix->window_height == window_height |
658 && matrix->window_vscroll == w->vscroll | |
659 && matrix->window_width == window_width) | |
660 return; | |
661 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
662 |
25012 | 663 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */ |
664 if (matrix->rows_allocated < dim.height) | |
665 { | |
666 int size = dim.height * sizeof (struct glyph_row); | |
667 new_rows = dim.height - matrix->rows_allocated; | |
668 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size); | |
669 bzero (matrix->rows + matrix->rows_allocated, | |
670 new_rows * sizeof *matrix->rows); | |
671 matrix->rows_allocated = dim.height; | |
672 } | |
673 else | |
674 new_rows = 0; | |
675 | |
676 /* If POOL is not null, MATRIX is a frame matrix or a window matrix | |
677 on a frame not using window-based redisplay. Set up pointers for | |
678 each row into the glyph pool. */ | |
679 if (matrix->pool) | |
680 { | |
681 xassert (matrix->pool->glyphs); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
682 |
25012 | 683 if (w) |
684 { | |
685 left = margin_glyphs_to_reserve (w, dim.width, | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
686 w->left_margin_cols); |
25012 | 687 right = margin_glyphs_to_reserve (w, dim.width, |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
688 w->right_margin_cols); |
25012 | 689 } |
690 else | |
691 left = right = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
692 |
25012 | 693 for (i = 0; i < dim.height; ++i) |
694 { | |
695 struct glyph_row *row = &matrix->rows[i]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
696 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
697 row->glyphs[LEFT_MARGIN_AREA] |
25012 | 698 = (matrix->pool->glyphs |
699 + (y + i) * matrix->pool->ncolumns | |
700 + x); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
701 |
25012 | 702 if (w == NULL |
703 || row == matrix->rows + dim.height - 1 | |
25546 | 704 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 705 { |
706 row->glyphs[TEXT_AREA] | |
707 = row->glyphs[LEFT_MARGIN_AREA]; | |
708 row->glyphs[RIGHT_MARGIN_AREA] | |
709 = row->glyphs[TEXT_AREA] + dim.width; | |
710 row->glyphs[LAST_AREA] | |
711 = row->glyphs[RIGHT_MARGIN_AREA]; | |
712 } | |
713 else | |
714 { | |
715 row->glyphs[TEXT_AREA] | |
716 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
717 row->glyphs[RIGHT_MARGIN_AREA] | |
718 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
719 row->glyphs[LAST_AREA] | |
720 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
721 } | |
722 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
723 |
25012 | 724 matrix->left_margin_glyphs = left; |
725 matrix->right_margin_glyphs = right; | |
726 } | |
727 else | |
728 { | |
729 /* If MATRIX->pool is null, MATRIX is responsible for managing | |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
730 its own memory. It is a window matrix for window-based redisplay. |
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
731 Allocate glyph memory from the heap. */ |
25012 | 732 if (dim.width > matrix->matrix_w |
733 || new_rows | |
25546 | 734 || header_line_changed_p |
25012 | 735 || marginal_areas_changed_p) |
736 { | |
737 struct glyph_row *row = matrix->rows; | |
738 struct glyph_row *end = row + matrix->rows_allocated; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
739 |
25012 | 740 while (row < end) |
741 { | |
742 row->glyphs[LEFT_MARGIN_AREA] | |
743 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA], | |
744 (dim.width | |
745 * sizeof (struct glyph))); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
746 |
25012 | 747 /* The mode line never has marginal areas. */ |
748 if (row == matrix->rows + dim.height - 1 | |
25546 | 749 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 750 { |
751 row->glyphs[TEXT_AREA] | |
752 = row->glyphs[LEFT_MARGIN_AREA]; | |
753 row->glyphs[RIGHT_MARGIN_AREA] | |
754 = row->glyphs[TEXT_AREA] + dim.width; | |
755 row->glyphs[LAST_AREA] | |
756 = row->glyphs[RIGHT_MARGIN_AREA]; | |
757 } | |
758 else | |
759 { | |
760 row->glyphs[TEXT_AREA] | |
761 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
762 row->glyphs[RIGHT_MARGIN_AREA] | |
763 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
764 row->glyphs[LAST_AREA] | |
765 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
766 } | |
767 ++row; | |
768 } | |
769 } | |
770 | |
771 xassert (left >= 0 && right >= 0); | |
772 matrix->left_margin_glyphs = left; | |
773 matrix->right_margin_glyphs = right; | |
774 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
775 |
25012 | 776 /* Number of rows to be used by MATRIX. */ |
777 matrix->nrows = dim.height; | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
778 xassert (matrix->nrows >= 0); |
25012 | 779 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
780 if (w) |
25012 | 781 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
782 if (matrix == w->current_matrix) |
25012 | 783 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
784 /* 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
|
785 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
|
786 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
|
787 building desired matrices when this function runs. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
788 if (window_width < 0) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
789 window_width = window_box_width (w, -1); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
790 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
791 /* 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
|
792 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
|
793 of the window. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
794 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
|
795 && !header_line_changed_p |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
796 && new_rows == 0 |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
797 && dim.width == matrix->matrix_w |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
798 && matrix->window_left_col == WINDOW_LEFT_EDGE_COL (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
799 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w) |
37098
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
800 && matrix->window_width == window_width) |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
801 { |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
802 /* Find the last row in the window. */ |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
803 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
|
804 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
|
805 { |
38748
bb32ae33769e
(adjust_glyph_matrix): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
38734
diff
changeset
|
806 ++i; |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
807 break; |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
808 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
809 |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
810 /* 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
|
811 are invalidated below. */ |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
812 if (INTEGERP (w->window_end_vpos) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
813 && XFASTINT (w->window_end_vpos) >= i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
814 w->window_end_valid = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
815 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
816 while (i < matrix->nrows) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
817 matrix->rows[i++].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
818 } |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
819 else |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
820 { |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
821 for (i = 0; i < matrix->nrows; ++i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
822 matrix->rows[i].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
823 } |
25012 | 824 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
825 else if (matrix == w->desired_matrix) |
25012 | 826 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
827 /* 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
|
828 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
|
829 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
|
830 redisplays. */ |
25012 | 831 for (i = 0; i < matrix->nrows; ++i) |
832 matrix->rows[i].enabled_p = 0; | |
833 } | |
834 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
835 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
836 |
25012 | 837 /* Remember last values to be able to optimize frame redraws. */ |
838 matrix->matrix_x = x; | |
839 matrix->matrix_y = y; | |
840 matrix->matrix_w = dim.width; | |
841 matrix->matrix_h = dim.height; | |
842 | |
843 /* Record the top y location and height of W at the time the matrix | |
844 was last adjusted. This is used to optimize redisplay above. */ | |
845 if (w) | |
846 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
847 matrix->window_left_col = WINDOW_LEFT_EDGE_COL (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
848 matrix->window_top_line = WINDOW_TOP_EDGE_LINE (w); |
25012 | 849 matrix->window_height = window_height; |
850 matrix->window_width = window_width; | |
851 matrix->window_vscroll = w->vscroll; | |
852 } | |
853 } | |
854 | |
855 | |
856 /* Reverse the contents of rows in MATRIX between START and END. The | |
857 contents of the row at END - 1 end up at START, END - 2 at START + | |
858 1 etc. This is part of the implementation of rotate_matrix (see | |
859 below). */ | |
314 | 860 |
861 static void | |
25012 | 862 reverse_rows (matrix, start, end) |
863 struct glyph_matrix *matrix; | |
864 int start, end; | |
314 | 865 { |
25012 | 866 int i, j; |
867 | |
868 for (i = start, j = end - 1; i < j; ++i, --j) | |
869 { | |
870 /* Non-ISO HP/UX compiler doesn't like auto struct | |
871 initialization. */ | |
872 struct glyph_row temp; | |
873 temp = matrix->rows[i]; | |
874 matrix->rows[i] = matrix->rows[j]; | |
875 matrix->rows[j] = temp; | |
876 } | |
314 | 877 } |
878 | |
25012 | 879 |
880 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST - | |
881 1 by BY positions. BY < 0 means rotate left, i.e. towards lower | |
882 indices. (Note: this does not copy glyphs, only glyph pointers in | |
883 row structures are moved around). | |
884 | |
885 The algorithm used for rotating the vector was, I believe, first | |
886 described by Kernighan. See the vector R as consisting of two | |
887 sub-vectors AB, where A has length BY for BY >= 0. The result | |
888 after rotating is then BA. Reverse both sub-vectors to get ArBr | |
889 and reverse the result to get (ArBr)r which is BA. Similar for | |
890 rotating right. */ | |
891 | |
892 void | |
893 rotate_matrix (matrix, first, last, by) | |
894 struct glyph_matrix *matrix; | |
895 int first, last, by; | |
314 | 896 { |
25012 | 897 if (by < 0) |
898 { | |
899 /* Up (rotate left, i.e. towards lower indices). */ | |
900 by = -by; | |
901 reverse_rows (matrix, first, first + by); | |
902 reverse_rows (matrix, first + by, last); | |
903 reverse_rows (matrix, first, last); | |
904 } | |
905 else if (by > 0) | |
314 | 906 { |
25012 | 907 /* Down (rotate right, i.e. towards higher indices). */ |
908 reverse_rows (matrix, last - by, last); | |
909 reverse_rows (matrix, first, last - by); | |
910 reverse_rows (matrix, first, last); | |
314 | 911 } |
25012 | 912 } |
913 | |
914 | |
915 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows | |
916 with indices START <= index < END. Increment positions by DELTA/ | |
917 DELTA_BYTES. */ | |
918 | |
919 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
920 increment_matrix_positions (matrix, start, end, delta, delta_bytes) |
25012 | 921 struct glyph_matrix *matrix; |
922 int start, end, delta, delta_bytes; | |
923 { | |
924 /* Check that START and END are reasonable values. */ | |
925 xassert (start >= 0 && start <= matrix->nrows); | |
926 xassert (end >= 0 && end <= matrix->nrows); | |
927 xassert (start <= end); | |
928 | |
929 for (; start < end; ++start) | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
930 increment_row_positions (matrix->rows + start, delta, delta_bytes); |
25012 | 931 } |
932 | |
933 | |
934 /* Enable a range of rows in glyph matrix MATRIX. START and END are | |
935 the row indices of the first and last + 1 row to enable. If | |
936 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */ | |
937 | |
938 void | |
939 enable_glyph_matrix_rows (matrix, start, end, enabled_p) | |
940 struct glyph_matrix *matrix; | |
941 int start, end; | |
942 int enabled_p; | |
943 { | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
944 xassert (start <= end); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
945 xassert (start >= 0 && start < matrix->nrows); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
946 xassert (end >= 0 && end <= matrix->nrows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
947 |
25012 | 948 for (; start < end; ++start) |
949 matrix->rows[start].enabled_p = enabled_p != 0; | |
950 } | |
951 | |
952 | |
953 /* Clear MATRIX. | |
954 | |
955 This empties all rows in MATRIX by setting the enabled_p flag for | |
956 all rows of the matrix to zero. The function prepare_desired_row | |
957 will eventually really clear a row when it sees one with a zero | |
958 enabled_p flag. | |
959 | |
960 Resets update hints to defaults value. The only update hint | |
961 currently present is the flag MATRIX->no_scrolling_p. */ | |
962 | |
963 void | |
964 clear_glyph_matrix (matrix) | |
965 struct glyph_matrix *matrix; | |
966 { | |
967 if (matrix) | |
314 | 968 { |
25012 | 969 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0); |
970 matrix->no_scrolling_p = 0; | |
314 | 971 } |
972 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
973 |
25012 | 974 |
975 /* Shift part of the glyph matrix MATRIX of window W up or down. | |
976 Increment y-positions in glyph rows between START and END by DY, | |
977 and recompute their visible height. */ | |
978 | |
979 void | |
980 shift_glyph_matrix (w, matrix, start, end, dy) | |
981 struct window *w; | |
982 struct glyph_matrix *matrix; | |
983 int start, end, dy; | |
984 { | |
985 int min_y, max_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
986 |
25012 | 987 xassert (start <= end); |
988 xassert (start >= 0 && start < matrix->nrows); | |
989 xassert (end >= 0 && end <= matrix->nrows); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
990 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
991 min_y = WINDOW_HEADER_LINE_HEIGHT (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
992 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
993 |
25012 | 994 for (; start < end; ++start) |
995 { | |
996 struct glyph_row *row = &matrix->rows[start]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
997 |
25012 | 998 row->y += dy; |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
999 row->visible_height = row->height; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1000 |
25012 | 1001 if (row->y < min_y) |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1002 row->visible_height -= min_y - row->y; |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1003 if (row->y + row->height > max_y) |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1004 row->visible_height -= row->y + row->height - max_y; |
25012 | 1005 } |
1006 } | |
1007 | |
1008 | |
1009 /* Mark all rows in current matrices of frame F as invalid. Marking | |
1010 invalid is done by setting enabled_p to zero for all rows in a | |
1011 current matrix. */ | |
1012 | |
1013 void | |
1014 clear_current_matrices (f) | |
1015 register struct frame *f; | |
1016 { | |
1017 /* Clear frame current matrix, if we have one. */ | |
1018 if (f->current_matrix) | |
1019 clear_glyph_matrix (f->current_matrix); | |
1020 | |
1021 /* Clear the matrix of the menu bar window, if such a window exists. | |
1022 The menu bar window is currently used to display menus on X when | |
1023 no toolkit support is compiled in. */ | |
1024 if (WINDOWP (f->menu_bar_window)) | |
1025 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix); | |
1026 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1027 /* 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
|
1028 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
|
1029 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |
25012 | 1030 |
1031 /* Clear current window matrices. */ | |
1032 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1033 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0); | |
1034 } | |
1035 | |
1036 | |
1037 /* Clear out all display lines of F for a coming redisplay. */ | |
314 | 1038 |
21514 | 1039 void |
25012 | 1040 clear_desired_matrices (f) |
1041 register struct frame *f; | |
314 | 1042 { |
25012 | 1043 if (f->desired_matrix) |
1044 clear_glyph_matrix (f->desired_matrix); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1045 |
25012 | 1046 if (WINDOWP (f->menu_bar_window)) |
1047 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix); | |
1048 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1049 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
|
1050 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix); |
25012 | 1051 |
1052 /* Do it for window matrices. */ | |
1053 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1054 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
1055 } | |
1056 | |
1057 | |
1058 /* Clear matrices in window tree rooted in W. If DESIRED_P is | |
1059 non-zero clear desired matrices, otherwise clear current matrices. */ | |
1060 | |
1061 static void | |
1062 clear_window_matrices (w, desired_p) | |
1063 struct window *w; | |
1064 int desired_p; | |
1065 { | |
1066 while (w) | |
314 | 1067 { |
25012 | 1068 if (!NILP (w->hchild)) |
1069 { | |
1070 xassert (WINDOWP (w->hchild)); | |
1071 clear_window_matrices (XWINDOW (w->hchild), desired_p); | |
1072 } | |
1073 else if (!NILP (w->vchild)) | |
314 | 1074 { |
25012 | 1075 xassert (WINDOWP (w->vchild)); |
1076 clear_window_matrices (XWINDOW (w->vchild), desired_p); | |
1077 } | |
1078 else | |
1079 { | |
1080 if (desired_p) | |
1081 clear_glyph_matrix (w->desired_matrix); | |
1082 else | |
314 | 1083 { |
25012 | 1084 clear_glyph_matrix (w->current_matrix); |
1085 w->window_end_valid = Qnil; | |
314 | 1086 } |
25012 | 1087 } |
1088 | |
1089 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
1090 } | |
1091 } | |
1092 | |
1093 | |
1094 | |
1095 /*********************************************************************** | |
1096 Glyph Rows | |
1097 | |
1098 See dispextern.h for an overall explanation of glyph rows. | |
1099 ***********************************************************************/ | |
1100 | |
1101 /* Clear glyph row ROW. Do it in a way that makes it robust against | |
1102 changes in the glyph_row structure, i.e. addition or removal of | |
1103 structure members. */ | |
1104 | |
33527
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1105 static struct glyph_row null_row; |
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1106 |
25012 | 1107 void |
1108 clear_glyph_row (row) | |
1109 struct glyph_row *row; | |
1110 { | |
1111 struct glyph *p[1 + LAST_AREA]; | |
1112 | |
1113 /* Save pointers. */ | |
1114 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA]; | |
1115 p[TEXT_AREA] = row->glyphs[TEXT_AREA]; | |
1116 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA]; | |
1117 p[LAST_AREA] = row->glyphs[LAST_AREA]; | |
1118 | |
1119 /* Clear. */ | |
1120 *row = null_row; | |
1121 | |
1122 /* Restore pointers. */ | |
1123 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA]; | |
1124 row->glyphs[TEXT_AREA] = p[TEXT_AREA]; | |
1125 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA]; | |
1126 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
|
1127 |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1128 #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
|
1129 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
|
1130 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
|
1131 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
|
1132 returned by xmalloc. If flickering happens again, activate |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1133 the code below. If the flickering is gone with that, chances |
30041
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1134 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
|
1135 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
|
1136 #endif |
25012 | 1137 } |
1138 | |
1139 | |
1140 /* Make ROW an empty, enabled row of canonical character height, | |
1141 in window W starting at y-position Y. */ | |
1142 | |
1143 void | |
1144 blank_row (w, row, y) | |
1145 struct window *w; | |
1146 struct glyph_row *row; | |
1147 int y; | |
1148 { | |
1149 int min_y, max_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1150 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1151 min_y = WINDOW_HEADER_LINE_HEIGHT (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1152 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1153 |
25012 | 1154 clear_glyph_row (row); |
1155 row->y = y; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1156 row->ascent = row->phys_ascent = 0; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1157 row->height = row->phys_height = FRAME_LINE_HEIGHT (XFRAME (w->frame)); |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1158 row->visible_height = row->height; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1159 |
25012 | 1160 if (row->y < min_y) |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1161 row->visible_height -= min_y - row->y; |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1162 if (row->y + row->height > max_y) |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1163 row->visible_height -= row->y + row->height - max_y; |
25012 | 1164 |
1165 row->enabled_p = 1; | |
1166 } | |
1167 | |
1168 | |
1169 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES | |
1170 are the amounts by which to change positions. Note that the first | |
1171 glyph of the text area of a row can have a buffer position even if | |
1172 the used count of the text area is zero. Such rows display line | |
1173 ends. */ | |
1174 | |
1175 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1176 increment_row_positions (row, delta, delta_bytes) |
25012 | 1177 struct glyph_row *row; |
1178 int delta, delta_bytes; | |
1179 { | |
1180 int area, i; | |
1181 | |
1182 /* Increment start and end positions. */ | |
1183 MATRIX_ROW_START_CHARPOS (row) += delta; | |
1184 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes; | |
1185 MATRIX_ROW_END_CHARPOS (row) += delta; | |
1186 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes; | |
1187 | |
65003
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1188 if (!row->enabled_p) |
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1189 return; |
74ab28cf1192
(increment_row_positions): Skip non-enabled rows.
Kim F. Storm <storm@cua.dk>
parents:
64776
diff
changeset
|
1190 |
25012 | 1191 /* Increment positions in glyphs. */ |
1192 for (area = 0; area < LAST_AREA; ++area) | |
1193 for (i = 0; i < row->used[area]; ++i) | |
1194 if (BUFFERP (row->glyphs[area][i].object) | |
1195 && row->glyphs[area][i].charpos > 0) | |
1196 row->glyphs[area][i].charpos += delta; | |
1197 | |
1198 /* Capture the case of rows displaying a line end. */ | |
1199 if (row->used[TEXT_AREA] == 0 | |
1200 && MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1201 row->glyphs[TEXT_AREA]->charpos += delta; | |
1202 } | |
1203 | |
1204 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1205 #if 0 |
25012 | 1206 /* Swap glyphs between two glyph rows A and B. This exchanges glyph |
1207 contents, i.e. glyph structure contents are exchanged between A and | |
1208 B without changing glyph pointers in A and B. */ | |
1209 | |
1210 static void | |
1211 swap_glyphs_in_rows (a, b) | |
1212 struct glyph_row *a, *b; | |
1213 { | |
1214 int area; | |
1215 | |
1216 for (area = 0; area < LAST_AREA; ++area) | |
1217 { | |
1218 /* Number of glyphs to swap. */ | |
1219 int max_used = max (a->used[area], b->used[area]); | |
1220 | |
1221 /* Start of glyphs in area of row A. */ | |
1222 struct glyph *glyph_a = a->glyphs[area]; | |
1223 | |
1224 /* End + 1 of glyphs in area of row A. */ | |
1225 struct glyph *glyph_a_end = a->glyphs[max_used]; | |
1226 | |
1227 /* Start of glyphs in area of row B. */ | |
1228 struct glyph *glyph_b = b->glyphs[area]; | |
1229 | |
1230 while (glyph_a < glyph_a_end) | |
1231 { | |
1232 /* Non-ISO HP/UX compiler doesn't like auto struct | |
1233 initialization. */ | |
1234 struct glyph temp; | |
1235 temp = *glyph_a; | |
1236 *glyph_a = *glyph_b; | |
1237 *glyph_b = temp; | |
1238 ++glyph_a; | |
1239 ++glyph_b; | |
314 | 1240 } |
1241 } | |
1242 } | |
25012 | 1243 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1244 #endif /* 0 */ |
25012 | 1245 |
1246 /* Exchange pointers to glyph memory between glyph rows A and B. */ | |
1247 | |
1248 static INLINE void | |
1249 swap_glyph_pointers (a, b) | |
1250 struct glyph_row *a, *b; | |
1251 { | |
1252 int i; | |
1253 for (i = 0; i < LAST_AREA + 1; ++i) | |
1254 { | |
1255 struct glyph *temp = a->glyphs[i]; | |
1256 a->glyphs[i] = b->glyphs[i]; | |
1257 b->glyphs[i] = temp; | |
1258 } | |
1259 } | |
1260 | |
1261 | |
1262 /* Copy glyph row structure FROM to glyph row structure TO, except | |
1263 that glyph pointers in the structures are left unchanged. */ | |
1264 | |
1265 INLINE void | |
1266 copy_row_except_pointers (to, from) | |
1267 struct glyph_row *to, *from; | |
1268 { | |
1269 struct glyph *pointers[1 + LAST_AREA]; | |
1270 | |
1271 /* Save glyph pointers of TO. */ | |
1272 bcopy (to->glyphs, pointers, sizeof to->glyphs); | |
1273 | |
1274 /* Do a structure assignment. */ | |
1275 *to = *from; | |
1276 | |
1277 /* Restore original pointers of TO. */ | |
1278 bcopy (pointers, to->glyphs, sizeof to->glyphs); | |
1279 } | |
1280 | |
1281 | |
1282 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in | |
1283 TO and FROM are left unchanged. Glyph contents are copied from the | |
1284 glyph memory of FROM to the glyph memory of TO. Increment buffer | |
1285 positions in row TO by DELTA/ DELTA_BYTES. */ | |
1286 | |
1287 void | |
1288 copy_glyph_row_contents (to, from, delta, delta_bytes) | |
1289 struct glyph_row *to, *from; | |
1290 int delta, delta_bytes; | |
1291 { | |
1292 int area; | |
1293 | |
1294 /* This is like a structure assignment TO = FROM, except that | |
1295 glyph pointers in the rows are left unchanged. */ | |
1296 copy_row_except_pointers (to, from); | |
1297 | |
1298 /* Copy glyphs from FROM to TO. */ | |
1299 for (area = 0; area < LAST_AREA; ++area) | |
1300 if (from->used[area]) | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1301 bcopy (from->glyphs[area], to->glyphs[area], |
25012 | 1302 from->used[area] * sizeof (struct glyph)); |
1303 | |
1304 /* Increment buffer positions in TO by DELTA. */ | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1305 increment_row_positions (to, delta, delta_bytes); |
25012 | 1306 } |
1307 | |
1308 | |
1309 /* Assign glyph row FROM to glyph row TO. This works like a structure | |
1310 assignment TO = FROM, except that glyph pointers are not copied but | |
1311 exchanged between TO and FROM. Pointers must be exchanged to avoid | |
1312 a memory leak. */ | |
1313 | |
1314 static INLINE void | |
1315 assign_row (to, from) | |
1316 struct glyph_row *to, *from; | |
1317 { | |
1318 swap_glyph_pointers (to, from); | |
1319 copy_row_except_pointers (to, from); | |
1320 } | |
1321 | |
1322 | |
1323 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is | |
1324 a row in a window matrix, is a slice of the glyph memory of the | |
1325 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value | |
1326 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph | |
1327 memory of FRAME_ROW. */ | |
1328 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
1329 #if GLYPH_DEBUG |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1330 |
25012 | 1331 static int |
1332 glyph_row_slice_p (window_row, frame_row) | |
1333 struct glyph_row *window_row, *frame_row; | |
1334 { | |
1335 struct glyph *window_glyph_start = window_row->glyphs[0]; | |
1336 struct glyph *frame_glyph_start = frame_row->glyphs[0]; | |
1337 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA]; | |
1338 | |
1339 return (frame_glyph_start <= window_glyph_start | |
1340 && window_glyph_start < frame_glyph_end); | |
1341 } | |
1342 | |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1343 #endif /* GLYPH_DEBUG */ |
25012 | 1344 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1345 #if 0 |
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1346 |
25012 | 1347 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice |
1348 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row | |
1349 in WINDOW_MATRIX is found satisfying the condition. */ | |
1350 | |
1351 static struct glyph_row * | |
1352 find_glyph_row_slice (window_matrix, frame_matrix, row) | |
1353 struct glyph_matrix *window_matrix, *frame_matrix; | |
1354 int row; | |
1355 { | |
1356 int i; | |
1357 | |
1358 xassert (row >= 0 && row < frame_matrix->nrows); | |
1359 | |
1360 for (i = 0; i < window_matrix->nrows; ++i) | |
1361 if (glyph_row_slice_p (window_matrix->rows + i, | |
1362 frame_matrix->rows + row)) | |
1363 break; | |
1364 | |
1365 return i < window_matrix->nrows ? window_matrix->rows + i : 0; | |
1366 } | |
1367 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1368 #endif /* 0 */ |
25012 | 1369 |
1370 /* Prepare ROW for display. Desired rows are cleared lazily, | |
1371 i.e. they are only marked as to be cleared by setting their | |
1372 enabled_p flag to zero. When a row is to be displayed, a prior | |
1373 call to this function really clears it. */ | |
1374 | |
1375 void | |
1376 prepare_desired_row (row) | |
1377 struct glyph_row *row; | |
1378 { | |
1379 if (!row->enabled_p) | |
1380 { | |
1381 clear_glyph_row (row); | |
1382 row->enabled_p = 1; | |
1383 } | |
1384 } | |
1385 | |
1386 | |
1387 /* Return a hash code for glyph row ROW. */ | |
1388 | |
1389 int | |
1390 line_hash_code (row) | |
1391 struct glyph_row *row; | |
1392 { | |
1393 int hash = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1394 |
25012 | 1395 if (row->enabled_p) |
1396 { | |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1397 struct glyph *glyph = row->glyphs[TEXT_AREA]; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1398 struct glyph *end = glyph + row->used[TEXT_AREA]; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1399 |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1400 while (glyph < end) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1401 { |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1402 int c = glyph->u.ch; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1403 int face_id = glyph->face_id; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1404 if (must_write_spaces) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1405 c -= SPACEGLYPH; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1406 hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + c; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1407 hash = (((hash << 4) + (hash >> 24)) & 0x0fffffff) + face_id; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1408 ++glyph; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1409 } |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1410 |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1411 if (hash == 0) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1412 hash = 1; |
25012 | 1413 } |
1414 | |
1415 return hash; | |
1416 } | |
1417 | |
1418 | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1419 /* Return the cost of drawing line VPOS in MATRIX. The cost equals |
25012 | 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 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1442 /* All blank line. */ |
25012 | 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); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
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); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1469 |
25012 | 1470 ++beg; |
1471 } | |
1472 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1473 |
25012 | 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 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
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; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1507 |
25012 | 1508 a_glyph = a->glyphs[area]; |
1509 a_end = a_glyph + a->used[area]; | |
1510 b_glyph = b->glyphs[area]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1511 |
25012 | 1512 while (a_glyph < a_end |
1513 && GLYPH_EQUAL_P (a_glyph, b_glyph)) | |
1514 ++a_glyph, ++b_glyph; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1515 |
25012 | 1516 if (a_glyph != a_end) |
1517 return 0; | |
1518 } | |
1519 | |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1520 if (a->fill_line_p != b->fill_line_p |
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1521 || a->cursor_in_fringe_p != b->cursor_in_fringe_p |
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1522 || a->left_fringe_bitmap != b->left_fringe_bitmap |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
1523 || a->left_fringe_face_id != b->left_fringe_face_id |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1524 || a->right_fringe_bitmap != b->right_fringe_bitmap |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
1525 || a->right_fringe_face_id != b->right_fringe_face_id |
61633
a76a30ee7c89
(row_equal_p, update_window_line, scrolling_window):
Kim F. Storm <storm@cua.dk>
parents:
61416
diff
changeset
|
1526 || a->overlay_arrow_bitmap != b->overlay_arrow_bitmap |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1527 || a->exact_window_width_line_p != b->exact_window_width_line_p |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1528 || a->overlapped_p != b->overlapped_p |
25012 | 1529 || (MATRIX_ROW_CONTINUATION_LINE_P (a) |
1530 != MATRIX_ROW_CONTINUATION_LINE_P (b)) | |
1531 /* Different partially visible characters on left margin. */ | |
1532 || a->x != b->x | |
1533 /* Different height. */ | |
1534 || a->ascent != b->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1535 || a->phys_ascent != b->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1536 || a->phys_height != b->phys_height |
25012 | 1537 || a->visible_height != b->visible_height) |
1538 return 0; | |
1539 } | |
1540 | |
1541 return 1; | |
1542 } | |
1543 | |
1544 | |
314 | 1545 |
25012 | 1546 /*********************************************************************** |
1547 Glyph Pool | |
1548 | |
1549 See dispextern.h for an overall explanation of glyph pools. | |
1550 ***********************************************************************/ | |
1551 | |
1552 /* Allocate a glyph_pool structure. The structure returned is | |
1553 initialized with zeros. The global variable glyph_pool_count is | |
1554 incremented for each pool allocated. */ | |
1555 | |
1556 static struct glyph_pool * | |
1557 new_glyph_pool () | |
1558 { | |
1559 struct glyph_pool *result; | |
1560 | |
1561 /* Allocate a new glyph_pool and clear it. */ | |
1562 result = (struct glyph_pool *) xmalloc (sizeof *result); | |
1563 bzero (result, sizeof *result); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1564 |
25012 | 1565 /* For memory leak and double deletion checking. */ |
1566 ++glyph_pool_count; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1567 |
25012 | 1568 return result; |
1569 } | |
1570 | |
1571 | |
1572 /* Free a glyph_pool structure POOL. The function may be called with | |
1573 a null POOL pointer. The global variable glyph_pool_count is | |
1574 decremented with every pool structure freed. If this count gets | |
1575 negative, more structures were freed than allocated, i.e. one | |
1576 structure must have been freed more than once or a bogus pointer | |
1577 was passed to free_glyph_pool. */ | |
1578 | |
1579 static void | |
1580 free_glyph_pool (pool) | |
1581 struct glyph_pool *pool; | |
1582 { | |
1583 if (pool) | |
1584 { | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1585 /* More freed than allocated? */ |
25012 | 1586 --glyph_pool_count; |
1587 xassert (glyph_pool_count >= 0); | |
1588 | |
1589 xfree (pool->glyphs); | |
1590 xfree (pool); | |
1591 } | |
1592 } | |
1593 | |
1594 | |
1595 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and | |
1596 columns we need. This function never shrinks a pool. The only | |
1597 case in which this would make sense, would be when a frame's size | |
1598 is changed from a large value to a smaller one. But, if someone | |
1599 does it once, we can expect that he will do it again. | |
1600 | |
1601 Value is non-zero if the pool changed in a way which makes | |
1602 re-adjusting window glyph matrices necessary. */ | |
1603 | |
1604 static int | |
1605 realloc_glyph_pool (pool, matrix_dim) | |
1606 struct glyph_pool *pool; | |
1607 struct dim matrix_dim; | |
1608 { | |
1609 int needed; | |
1610 int changed_p; | |
1611 | |
1612 changed_p = (pool->glyphs == 0 | |
1613 || matrix_dim.height != pool->nrows | |
1614 || matrix_dim.width != pool->ncolumns); | |
1615 | |
1616 /* Enlarge the glyph pool. */ | |
1617 needed = matrix_dim.width * matrix_dim.height; | |
1618 if (needed > pool->nglyphs) | |
1619 { | |
1620 int size = needed * sizeof (struct glyph); | |
1621 | |
1622 if (pool->glyphs) | |
1623 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size); | |
1624 else | |
1625 { | |
1626 pool->glyphs = (struct glyph *) xmalloc (size); | |
1627 bzero (pool->glyphs, size); | |
1628 } | |
1629 | |
1630 pool->nglyphs = needed; | |
1631 } | |
1632 | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1633 /* Remember the number of rows and columns because (a) we use them |
25012 | 1634 to do sanity checks, and (b) the number of columns determines |
1635 where rows in the frame matrix start---this must be available to | |
1636 determine pointers to rows of window sub-matrices. */ | |
1637 pool->nrows = matrix_dim.height; | |
1638 pool->ncolumns = matrix_dim.width; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1639 |
25012 | 1640 return changed_p; |
1641 } | |
1642 | |
1643 | |
1644 | |
1645 /*********************************************************************** | |
1646 Debug Code | |
1647 ***********************************************************************/ | |
1648 | |
1649 #if GLYPH_DEBUG | |
1650 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1651 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1652 /* 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
|
1653 the debugger. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1654 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1655 void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1656 flush_stdout () |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1657 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1658 fflush (stdout); |
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 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1661 |
25012 | 1662 /* Check that no glyph pointers have been lost in MATRIX. If a |
1663 pointer has been lost, e.g. by using a structure assignment between | |
1664 rows, at least one pointer must occur more than once in the rows of | |
1665 MATRIX. */ | |
1666 | |
1667 void | |
1668 check_matrix_pointer_lossage (matrix) | |
1669 struct glyph_matrix *matrix; | |
1670 { | |
1671 int i, j; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1672 |
25012 | 1673 for (i = 0; i < matrix->nrows; ++i) |
1674 for (j = 0; j < matrix->nrows; ++j) | |
1675 xassert (i == j | |
1676 || (matrix->rows[i].glyphs[TEXT_AREA] | |
1677 != matrix->rows[j].glyphs[TEXT_AREA])); | |
1678 } | |
1679 | |
1680 | |
1681 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */ | |
1682 | |
1683 struct glyph_row * | |
1684 matrix_row (matrix, row) | |
1685 struct glyph_matrix *matrix; | |
1686 int row; | |
1687 { | |
1688 xassert (matrix && matrix->rows); | |
1689 xassert (row >= 0 && row < matrix->nrows); | |
1690 | |
1691 /* That's really too slow for normal testing because this function | |
1692 is called almost everywhere. Although---it's still astonishingly | |
1693 fast, so it is valuable to have for debugging purposes. */ | |
314 | 1694 #if 0 |
25012 | 1695 check_matrix_pointer_lossage (matrix); |
1696 #endif | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1697 |
25012 | 1698 return matrix->rows + row; |
1699 } | |
1700 | |
1701 | |
1702 #if 0 /* This function makes invalid assumptions when text is | |
1703 partially invisible. But it might come handy for debugging | |
1704 nevertheless. */ | |
1705 | |
1706 /* Check invariants that must hold for an up to date current matrix of | |
1707 window W. */ | |
1708 | |
1709 static void | |
1710 check_matrix_invariants (w) | |
314 | 1711 struct window *w; |
1712 { | |
25012 | 1713 struct glyph_matrix *matrix = w->current_matrix; |
1714 int yb = window_text_bottom_y (w); | |
1715 struct glyph_row *row = matrix->rows; | |
1716 struct glyph_row *last_text_row = NULL; | |
1717 struct buffer *saved = current_buffer; | |
1718 struct buffer *buffer = XBUFFER (w->buffer); | |
1719 int c; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1720 |
25012 | 1721 /* This can sometimes happen for a fresh window. */ |
1722 if (matrix->nrows < 2) | |
1723 return; | |
1724 | |
1725 set_buffer_temp (buffer); | |
1726 | |
1727 /* Note: last row is always reserved for the mode line. */ | |
1728 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1729 && MATRIX_ROW_BOTTOM_Y (row) < yb) | |
1730 { | |
1731 struct glyph_row *next = row + 1; | |
1732 | |
1733 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1734 last_text_row = row; | |
1735 | |
1736 /* Check that character and byte positions are in sync. */ | |
1737 xassert (MATRIX_ROW_START_BYTEPOS (row) | |
1738 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row))); | |
1739 | |
1740 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can | |
1741 have such a position temporarily in case of a minibuffer | |
1742 displaying something like `[Sole completion]' at its end. */ | |
1743 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer)) | |
1744 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1745 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row))); | |
1746 | |
1747 /* Check that end position of `row' is equal to start position | |
1748 of next row. */ | |
1749 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next)) | |
1750 { | |
1751 xassert (MATRIX_ROW_END_CHARPOS (row) | |
1752 == MATRIX_ROW_START_CHARPOS (next)); | |
1753 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1754 == MATRIX_ROW_START_BYTEPOS (next)); | |
1755 } | |
1756 row = next; | |
1757 } | |
1758 | |
1759 xassert (w->current_matrix->nrows == w->desired_matrix->nrows); | |
1760 xassert (w->desired_matrix->rows != NULL); | |
1761 set_buffer_temp (saved); | |
1762 } | |
1763 | |
1764 #endif /* 0 */ | |
1765 | |
1766 #endif /* GLYPH_DEBUG != 0 */ | |
1767 | |
1768 | |
1769 | |
1770 /********************************************************************** | |
1771 Allocating/ Adjusting Glyph Matrices | |
1772 **********************************************************************/ | |
1773 | |
1774 /* Allocate glyph matrices over a window tree for a frame-based | |
1775 redisplay | |
1776 | |
1777 X and Y are column/row within the frame glyph matrix where | |
1778 sub-matrices for the window tree rooted at WINDOW must be | |
1779 allocated. CH_DIM contains the dimensions of the smallest | |
1780 character that could be used during display. DIM_ONLY_P non-zero | |
1781 means that the caller of this function is only interested in the | |
1782 result matrix dimension, and matrix adjustments should not be | |
1783 performed. | |
1784 | |
1785 The function returns the total width/height of the sub-matrices of | |
1786 the window tree. If called on a frame root window, the computation | |
1787 will take the mini-buffer window into account. | |
1788 | |
1789 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits | |
1790 | |
1791 NEW_LEAF_MATRIX set if any window in the tree did not have a | |
1792 glyph matrices yet, and | |
1793 | |
1794 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of | |
1795 any window in the tree will be changed or have been changed (see | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1796 DIM_ONLY_P) |
25012 | 1797 |
1798 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this | |
1799 function. | |
1800 | |
1801 Windows are arranged into chains of windows on the same level | |
1802 through the next fields of window structures. Such a level can be | |
1803 either a sequence of horizontally adjacent windows from left to | |
1804 right, or a sequence of vertically adjacent windows from top to | |
1805 bottom. Each window in a horizontal sequence can be either a leaf | |
1806 window or a vertical sequence; a window in a vertical sequence can | |
1807 be either a leaf or a horizontal sequence. All windows in a | |
1808 horizontal sequence have the same height, and all windows in a | |
1809 vertical sequence have the same width. | |
1810 | |
1811 This function uses, for historical reasons, a more general | |
1812 algorithm to determine glyph matrix dimensions that would be | |
1813 necessary. | |
1814 | |
1815 The matrix height of a horizontal sequence is determined by the | |
1816 maximum height of any matrix in the sequence. The matrix width of | |
1817 a horizontal sequence is computed by adding up matrix widths of | |
1818 windows in the sequence. | |
1819 | |
1820 |<------- result width ------->| | |
1821 +---------+----------+---------+ --- | |
1822 | | | | | | |
1823 | | | | | |
1824 +---------+ | | result height | |
1825 | +---------+ | |
1826 | | | | |
1827 +----------+ --- | |
1828 | |
1829 The matrix width of a vertical sequence is the maximum matrix width | |
1830 of any window in the sequence. Its height is computed by adding up | |
1831 matrix heights of windows in the sequence. | |
1832 | |
1833 |<---- result width -->| | |
1834 +---------+ --- | |
1835 | | | | |
1836 | | | | |
1837 +---------+--+ | | |
1838 | | | | |
1839 | | result height | |
1840 | | | |
1841 +------------+---------+ | | |
1842 | | | | |
1843 | | | | |
1844 +------------+---------+ --- */ | |
1845 | |
1846 /* Bit indicating that a new matrix will be allocated or has been | |
1847 allocated. */ | |
1848 | |
1849 #define NEW_LEAF_MATRIX (1 << 0) | |
1850 | |
1851 /* Bit indicating that a matrix will or has changed its location or | |
1852 size. */ | |
1853 | |
1854 #define CHANGED_LEAF_MATRIX (1 << 1) | |
1855 | |
1856 static struct dim | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1857 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
|
1858 window_change_flags) |
25012 | 1859 Lisp_Object window; |
1860 int x, y; | |
1861 int dim_only_p; | |
1862 int *window_change_flags; | |
1863 { | |
1864 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | |
1865 int x0 = x, y0 = y; | |
1866 int wmax = 0, hmax = 0; | |
1867 struct dim total; | |
1868 struct dim dim; | |
1869 struct window *w; | |
1870 int in_horz_combination_p; | |
1871 | |
1872 /* What combination is WINDOW part of? Compute this once since the | |
1873 result is the same for all windows in the `next' chain. The | |
1874 special case of a root window (parent equal to nil) is treated | |
1875 like a vertical combination because a root window's `next' | |
1876 points to the mini-buffer window, if any, which is arranged | |
1877 vertically below other windows. */ | |
1878 in_horz_combination_p | |
1879 = (!NILP (XWINDOW (window)->parent) | |
1880 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild)); | |
1881 | |
1882 /* For WINDOW and all windows on the same level. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1883 do |
25012 | 1884 { |
1885 w = XWINDOW (window); | |
1886 | |
1887 /* Get the dimension of the window sub-matrix for W, depending | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1888 on whether this is a combination or a leaf window. */ |
25012 | 1889 if (!NILP (w->hchild)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1890 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, |
25012 | 1891 dim_only_p, |
1892 window_change_flags); | |
1893 else if (!NILP (w->vchild)) | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1894 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, |
25012 | 1895 dim_only_p, |
1896 window_change_flags); | |
1897 else | |
1898 { | |
1899 /* If not already done, allocate sub-matrix structures. */ | |
1900 if (w->desired_matrix == NULL) | |
1901 { | |
1902 w->desired_matrix = new_glyph_matrix (f->desired_pool); | |
1903 w->current_matrix = new_glyph_matrix (f->current_pool); | |
1904 *window_change_flags |= NEW_LEAF_MATRIX; | |
1905 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1906 |
25012 | 1907 /* Width and height MUST be chosen so that there are no |
1908 holes in the frame matrix. */ | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1909 dim.width = required_matrix_width (w); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1910 dim.height = required_matrix_height (w); |
25012 | 1911 |
1912 /* Will matrix be re-allocated? */ | |
1913 if (x != w->desired_matrix->matrix_x | |
1914 || y != w->desired_matrix->matrix_y | |
1915 || dim.width != w->desired_matrix->matrix_w | |
1916 || dim.height != w->desired_matrix->matrix_h | |
1917 || (margin_glyphs_to_reserve (w, dim.width, | |
56496
069e4841ceb2
(margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
55021
diff
changeset
|
1918 w->left_margin_cols) |
25012 | 1919 != w->desired_matrix->left_margin_glyphs) |
1920 || (margin_glyphs_to_reserve (w, dim.width, | |
56496
069e4841ceb2
(margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
55021
diff
changeset
|
1921 w->right_margin_cols) |
25012 | 1922 != w->desired_matrix->right_margin_glyphs)) |
1923 *window_change_flags |= CHANGED_LEAF_MATRIX; | |
1924 | |
1925 /* Actually change matrices, if allowed. Do not consider | |
1926 CHANGED_LEAF_MATRIX computed above here because the pool | |
1927 may have been changed which we don't now here. We trust | |
1928 that we only will be called with DIM_ONLY_P != 0 when | |
1929 necessary. */ | |
1930 if (!dim_only_p) | |
1931 { | |
1932 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim); | |
1933 adjust_glyph_matrix (w, w->current_matrix, x, y, dim); | |
1934 } | |
1935 } | |
1936 | |
1937 /* If we are part of a horizontal combination, advance x for | |
1938 windows to the right of W; otherwise advance y for windows | |
1939 below W. */ | |
1940 if (in_horz_combination_p) | |
1941 x += dim.width; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1942 else |
25012 | 1943 y += dim.height; |
1944 | |
1945 /* Remember maximum glyph matrix dimensions. */ | |
1946 wmax = max (wmax, dim.width); | |
1947 hmax = max (hmax, dim.height); | |
1948 | |
1949 /* Next window on same level. */ | |
1950 window = w->next; | |
1951 } | |
1952 while (!NILP (window)); | |
1953 | |
1954 /* Set `total' to the total glyph matrix dimension of this window | |
1955 level. In a vertical combination, the width is the width of the | |
1956 widest window; the height is the y we finally reached, corrected | |
1957 by the y we started with. In a horizontal combination, the total | |
1958 height is the height of the tallest window, and the width is the | |
1959 x we finally reached, corrected by the x we started with. */ | |
1960 if (in_horz_combination_p) | |
1961 { | |
1962 total.width = x - x0; | |
1963 total.height = hmax; | |
1964 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1965 else |
25012 | 1966 { |
1967 total.width = wmax; | |
1968 total.height = y - y0; | |
1969 } | |
1970 | |
1971 return total; | |
1972 } | |
1973 | |
1974 | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1975 /* 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
|
1976 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1977 int |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1978 required_matrix_height (w) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1979 struct window *w; |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1980 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1981 #ifdef HAVE_WINDOW_SYSTEM |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1982 struct frame *f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1983 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1984 if (FRAME_WINDOW_P (f)) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1985 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1986 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
|
1987 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
|
1988 return (((window_pixel_height + ch_height - 1) |
56496
069e4841ceb2
(margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
55021
diff
changeset
|
1989 / ch_height) * w->nrows_scale_factor |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1990 /* 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
|
1991 bottom of the window. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1992 + 2 |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
1993 /* 2 for header and mode line. */ |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1994 + 2); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1995 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1996 #endif /* HAVE_WINDOW_SYSTEM */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1997 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1998 return WINDOW_TOTAL_LINES (w); |
39448
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 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2002 /* 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
|
2003 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2004 int |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2005 required_matrix_width (w) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2006 struct window *w; |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2007 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2008 #ifdef HAVE_WINDOW_SYSTEM |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2009 struct frame *f = XFRAME (w->frame); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2010 if (FRAME_WINDOW_P (f)) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2011 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2012 int ch_width = FRAME_SMALLEST_CHAR_WIDTH (f); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2013 int window_pixel_width = WINDOW_TOTAL_WIDTH (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2014 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2015 /* 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
|
2016 return (((window_pixel_width + ch_width - 1) |
56496
069e4841ceb2
(margin_glyphs_to_reserve): Apply ncols_scale_factor.
Kim F. Storm <storm@cua.dk>
parents:
55021
diff
changeset
|
2017 / ch_width) * w->ncols_scale_factor |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2018 /* 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
|
2019 + 2 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2020 /* One partially visible column at the right |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2021 edge of each marginal area. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2022 + 1 + 1); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2023 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2024 #endif /* HAVE_WINDOW_SYSTEM */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2025 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2026 return XINT (w->total_cols); |
39448
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 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2029 |
25012 | 2030 /* Allocate window matrices for window-based redisplay. W is the |
2031 window whose matrices must be allocated/reallocated. CH_DIM is the | |
2032 size of the smallest character that could potentially be used on W. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2033 |
25012 | 2034 static void |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2035 allocate_matrices_for_window_redisplay (w) |
25012 | 2036 struct window *w; |
2037 { | |
2038 while (w) | |
314 | 2039 { |
25012 | 2040 if (!NILP (w->vchild)) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2041 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild)); |
25012 | 2042 else if (!NILP (w->hchild)) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2043 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild)); |
25012 | 2044 else |
314 | 2045 { |
25012 | 2046 /* W is a leaf window. */ |
2047 struct dim dim; | |
2048 | |
2049 /* If matrices are not yet allocated, allocate them now. */ | |
2050 if (w->desired_matrix == NULL) | |
314 | 2051 { |
25012 | 2052 w->desired_matrix = new_glyph_matrix (NULL); |
2053 w->current_matrix = new_glyph_matrix (NULL); | |
314 | 2054 } |
25012 | 2055 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2056 dim.width = required_matrix_width (w); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2057 dim.height = required_matrix_height (w); |
25012 | 2058 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); |
2059 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim); | |
2060 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2061 |
25012 | 2062 w = NILP (w->next) ? NULL : XWINDOW (w->next); |
2063 } | |
2064 } | |
2065 | |
2066 | |
2067 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null, | |
2068 do it for all frames; otherwise do it just for the given frame. | |
2069 This function must be called when a new frame is created, its size | |
2070 changes, or its window configuration changes. */ | |
2071 | |
2072 void | |
2073 adjust_glyphs (f) | |
2074 struct frame *f; | |
2075 { | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2076 /* 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
|
2077 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
|
2078 BLOCK_INPUT; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2079 |
25012 | 2080 if (f) |
2081 adjust_frame_glyphs (f); | |
2082 else | |
2083 { | |
2084 Lisp_Object tail, lisp_frame; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2085 |
25012 | 2086 FOR_EACH_FRAME (tail, lisp_frame) |
2087 adjust_frame_glyphs (XFRAME (lisp_frame)); | |
2088 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2089 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2090 UNBLOCK_INPUT; |
25012 | 2091 } |
2092 | |
2093 | |
2094 /* Adjust frame glyphs when Emacs is initialized. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2095 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2096 To be called from init_display. |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2097 |
25012 | 2098 We need a glyph matrix because redraw will happen soon. |
2099 Unfortunately, window sizes on selected_frame are not yet set to | |
2100 meaningful values. I believe we can assume that there are only two | |
2101 windows on the frame---the mini-buffer and the root window. Frame | |
2102 height and width seem to be correct so far. So, set the sizes of | |
2103 windows to estimated values. */ | |
2104 | |
2105 static void | |
2106 adjust_frame_glyphs_initially () | |
2107 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2108 struct frame *sf = SELECTED_FRAME (); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2109 struct window *root = XWINDOW (sf->root_window); |
25012 | 2110 struct window *mini = XWINDOW (root->next); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2111 int frame_lines = FRAME_LINES (sf); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2112 int frame_cols = FRAME_COLS (sf); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2113 int top_margin = FRAME_TOP_MARGIN (sf); |
25012 | 2114 |
2115 /* Do it for the root window. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2116 XSETFASTINT (root->top_line, top_margin); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2117 XSETFASTINT (root->total_cols, frame_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2118 set_window_height (sf->root_window, frame_lines - 1 - top_margin, 0); |
25012 | 2119 |
2120 /* Do it for the mini-buffer window. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2121 XSETFASTINT (mini->top_line, frame_lines - 1); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2122 XSETFASTINT (mini->total_cols, frame_cols); |
25012 | 2123 set_window_height (root->next, 1, 0); |
2124 | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2125 adjust_frame_glyphs (sf); |
25012 | 2126 glyphs_initialized_initially_p = 1; |
2127 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2128 |
25012 | 2129 |
2130 /* Allocate/reallocate glyph matrices of a single frame F. */ | |
2131 | |
2132 static void | |
2133 adjust_frame_glyphs (f) | |
2134 struct frame *f; | |
2135 { | |
2136 if (FRAME_WINDOW_P (f)) | |
2137 adjust_frame_glyphs_for_window_redisplay (f); | |
2138 else | |
2139 adjust_frame_glyphs_for_frame_redisplay (f); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2140 |
25012 | 2141 /* Don't forget the message buffer and the buffer for |
2142 decode_mode_spec. */ | |
2143 adjust_frame_message_buffer (f); | |
2144 adjust_decode_mode_spec_buffer (f); | |
2145 | |
2146 f->glyphs_initialized_p = 1; | |
2147 } | |
2148 | |
2149 | |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2150 /* 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
|
2151 windows from the frame's current matrix. */ |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2152 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2153 static void |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2154 fake_current_matrices (window) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2155 Lisp_Object window; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2156 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2157 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2158 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2159 for (; !NILP (window); window = w->next) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2160 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2161 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2162 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2163 if (!NILP (w->hchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2164 fake_current_matrices (w->hchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2165 else if (!NILP (w->vchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2166 fake_current_matrices (w->vchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2167 else |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2168 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2169 int i; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2170 struct frame *f = XFRAME (w->frame); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2171 struct glyph_matrix *m = w->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2172 struct glyph_matrix *fm = f->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2173 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2174 xassert (m->matrix_h == WINDOW_TOTAL_LINES (w)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2175 xassert (m->matrix_w == WINDOW_TOTAL_COLS (w)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2176 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2177 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
|
2178 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2179 struct glyph_row *r = m->rows + i; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2180 struct glyph_row *fr = fm->rows + i + WINDOW_TOP_EDGE_LINE (w); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2181 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2182 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
|
2183 && 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
|
2184 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2185 r->enabled_p = fr->enabled_p; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2186 if (r->enabled_p) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2187 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2188 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
|
2189 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
|
2190 r->used[TEXT_AREA] = (m->matrix_w |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2191 - r->used[LEFT_MARGIN_AREA] |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2192 - r->used[RIGHT_MARGIN_AREA]); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2193 r->mode_line_p = 0; |
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 |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
2202 a glyph matrix holding the contents of F's current frame matrix. */ |
35307
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 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2251 |
35307
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; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2277 |
25012 | 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 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
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 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2314 /* Set up glyph pointers within window matrices. Do this only if |
25012 | 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). */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2326 xassert (matrix_dim.width == FRAME_COLS (f) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2327 && matrix_dim.height == FRAME_LINES (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
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)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2370 |
25012 | 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 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2378 |
25012 | 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. */ | |
49322 | 2384 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
25012 | 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. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2399 XSETFASTINT (w->top_line, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2400 XSETFASTINT (w->left_col, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2401 XSETFASTINT (w->total_lines, FRAME_MENU_BAR_LINES (f)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2402 XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (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 | |
49322 | 2407 #ifndef USE_GTK |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2408 /* 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
|
2409 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
|
2410 if (NILP (f->tool_bar_window)) |
25012 | 2411 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2412 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
|
2413 w = XWINDOW (f->tool_bar_window); |
25012 | 2414 XSETFRAME (w->frame, f); |
2415 w->pseudo_window_p = 1; | |
2416 } | |
2417 else | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2418 w = XWINDOW (f->tool_bar_window); |
25012 | 2419 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2420 XSETFASTINT (w->top_line, FRAME_MENU_BAR_LINES (f)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2421 XSETFASTINT (w->left_col, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2422 XSETFASTINT (w->total_lines, FRAME_TOOL_BAR_LINES (f)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2423 XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (f)); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2424 allocate_matrices_for_window_redisplay (w); |
49322 | 2425 #endif |
25012 | 2426 } |
2427 | |
2428 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2429 /* Adjust/ allocate message buffer of frame F. |
25012 | 2430 |
2431 Note that the message buffer is never freed. Since I could not | |
2432 find a free in 19.34, I assume that freeing it would be | |
2433 problematic in some way and don't do it either. | |
2434 | |
2435 (Implementation note: It should be checked if we can free it | |
2436 eventually without causing trouble). */ | |
2437 | |
2438 static void | |
2439 adjust_frame_message_buffer (f) | |
2440 struct frame *f; | |
2441 { | |
2442 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1; | |
2443 | |
2444 if (FRAME_MESSAGE_BUF (f)) | |
2445 { | |
2446 char *buffer = FRAME_MESSAGE_BUF (f); | |
2447 char *new_buffer = (char *) xrealloc (buffer, size); | |
2448 FRAME_MESSAGE_BUF (f) = new_buffer; | |
2449 } | |
2450 else | |
2451 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size); | |
2452 } | |
2453 | |
2454 | |
2455 /* Re-allocate buffer for decode_mode_spec on frame F. */ | |
2456 | |
2457 static void | |
2458 adjust_decode_mode_spec_buffer (f) | |
2459 struct frame *f; | |
2460 { | |
2461 f->decode_mode_spec_buffer | |
2462 = (char *) xrealloc (f->decode_mode_spec_buffer, | |
2463 FRAME_MESSAGE_BUF_SIZE (f) + 1); | |
2464 } | |
2465 | |
2466 | |
2467 | |
2468 /********************************************************************** | |
2469 Freeing Glyph Matrices | |
2470 **********************************************************************/ | |
2471 | |
2472 /* Free glyph memory for a frame F. F may be null. This function can | |
2473 be called for the same frame more than once. The root window of | |
2474 F may be nil when this function is called. This is the case when | |
2475 the function is called when F is destroyed. */ | |
2476 | |
2477 void | |
2478 free_glyphs (f) | |
2479 struct frame *f; | |
2480 { | |
2481 if (f && f->glyphs_initialized_p) | |
2482 { | |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2483 /* 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
|
2484 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
|
2485 BLOCK_INPUT; |
25012 | 2486 f->glyphs_initialized_p = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2487 |
25012 | 2488 /* Release window sub-matrices. */ |
2489 if (!NILP (f->root_window)) | |
2490 free_window_matrices (XWINDOW (f->root_window)); | |
2491 | |
2492 /* Free the dummy window for menu bars without X toolkit and its | |
2493 glyph matrices. */ | |
2494 if (!NILP (f->menu_bar_window)) | |
2495 { | |
2496 struct window *w = XWINDOW (f->menu_bar_window); | |
2497 free_glyph_matrix (w->desired_matrix); | |
2498 free_glyph_matrix (w->current_matrix); | |
2499 w->desired_matrix = w->current_matrix = NULL; | |
2500 f->menu_bar_window = Qnil; | |
2501 } | |
2502 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2503 /* 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
|
2504 if (!NILP (f->tool_bar_window)) |
25012 | 2505 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2506 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 2507 free_glyph_matrix (w->desired_matrix); |
2508 free_glyph_matrix (w->current_matrix); | |
2509 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
|
2510 f->tool_bar_window = Qnil; |
25012 | 2511 } |
2512 | |
2513 /* Release frame glyph matrices. Reset fields to zero in | |
2514 case we are called a second time. */ | |
2515 if (f->desired_matrix) | |
2516 { | |
2517 free_glyph_matrix (f->desired_matrix); | |
2518 free_glyph_matrix (f->current_matrix); | |
2519 f->desired_matrix = f->current_matrix = NULL; | |
2520 } | |
2521 | |
2522 /* Release glyph pools. */ | |
2523 if (f->desired_pool) | |
2524 { | |
2525 free_glyph_pool (f->desired_pool); | |
2526 free_glyph_pool (f->current_pool); | |
2527 f->desired_pool = f->current_pool = NULL; | |
314 | 2528 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2529 |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2530 UNBLOCK_INPUT; |
314 | 2531 } |
2532 } | |
2533 | |
25012 | 2534 |
2535 /* Free glyph sub-matrices in the window tree rooted at W. This | |
2536 function may be called with a null pointer, and it may be called on | |
2537 the same tree more than once. */ | |
2538 | |
2539 void | |
2540 free_window_matrices (w) | |
2541 struct window *w; | |
2542 { | |
2543 while (w) | |
2544 { | |
2545 if (!NILP (w->hchild)) | |
2546 free_window_matrices (XWINDOW (w->hchild)); | |
2547 else if (!NILP (w->vchild)) | |
2548 free_window_matrices (XWINDOW (w->vchild)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2549 else |
25012 | 2550 { |
2551 /* This is a leaf window. Free its memory and reset fields | |
2552 to zero in case this function is called a second time for | |
2553 W. */ | |
2554 free_glyph_matrix (w->current_matrix); | |
2555 free_glyph_matrix (w->desired_matrix); | |
2556 w->current_matrix = w->desired_matrix = NULL; | |
2557 } | |
2558 | |
2559 /* Next window on same level. */ | |
2560 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
2561 } | |
2562 } | |
2563 | |
2564 | |
2565 /* Check glyph memory leaks. This function is called from | |
2566 shut_down_emacs. Note that frames are not destroyed when Emacs | |
2567 exits. We therefore free all glyph memory for all active frames | |
2568 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
|
2569 |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2570 void |
25012 | 2571 check_glyph_memory () |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2572 { |
25012 | 2573 Lisp_Object tail, frame; |
2574 | |
2575 /* Free glyph memory for all frames. */ | |
2576 FOR_EACH_FRAME (tail, frame) | |
2577 free_glyphs (XFRAME (frame)); | |
2578 | |
2579 /* Check that nothing is left allocated. */ | |
2580 if (glyph_matrix_count) | |
2581 abort (); | |
2582 if (glyph_pool_count) | |
2583 abort (); | |
2584 } | |
2585 | |
2586 | |
2587 | |
2588 /********************************************************************** | |
2589 Building a Frame Matrix | |
2590 **********************************************************************/ | |
2591 | |
2592 /* Most of the redisplay code works on glyph matrices attached to | |
2593 windows. This is a good solution most of the time, but it is not | |
2594 suitable for terminal code. Terminal output functions cannot rely | |
2595 on being able to set an arbitrary terminal window. Instead they | |
2596 must be provided with a view of the whole frame, i.e. the whole | |
2597 screen. We build such a view by constructing a frame matrix from | |
2598 window matrices in this section. | |
2599 | |
2600 Windows that must be updated have their must_be_update_p flag set. | |
2601 For all such windows, their desired matrix is made part of the | |
2602 desired frame matrix. For other windows, their current matrix is | |
2603 made part of the desired frame matrix. | |
2604 | |
2605 +-----------------+----------------+ | |
2606 | desired | desired | | |
2607 | | | | |
2608 +-----------------+----------------+ | |
2609 | current | | |
2610 | | | |
2611 +----------------------------------+ | |
2612 | |
2613 Desired window matrices can be made part of the frame matrix in a | |
2614 cheap way: We exploit the fact that the desired frame matrix and | |
2615 desired window matrices share their glyph memory. This is not | |
2616 possible for current window matrices. Their glyphs are copied to | |
2617 the desired frame matrix. The latter is equivalent to | |
2618 preserve_other_columns in the old redisplay. | |
2619 | |
2620 Used glyphs counters for frame matrix rows are the result of adding | |
2621 up glyph lengths of the window matrices. A line in the frame | |
2622 matrix is enabled, if a corresponding line in a window matrix is | |
2623 enabled. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2624 |
25012 | 2625 After building the desired frame matrix, it will be passed to |
2626 terminal code, which will manipulate both the desired and current | |
2627 frame matrix. Changes applied to the frame's current matrix have | |
2628 to be visible in current window matrices afterwards, of course. | |
2629 | |
2630 This problem is solved like this: | |
2631 | |
2632 1. Window and frame matrices share glyphs. Window matrices are | |
2633 constructed in a way that their glyph contents ARE the glyph | |
2634 contents needed in a frame matrix. Thus, any modification of | |
2635 glyphs done in terminal code will be reflected in window matrices | |
2636 automatically. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2637 |
25012 | 2638 2. Exchanges of rows in a frame matrix done by terminal code are |
2639 intercepted by hook functions so that corresponding row operations | |
2640 on window matrices can be performed. This is necessary because we | |
2641 use pointers to glyphs in glyph row structures. To satisfy the | |
2642 assumption of point 1 above that glyphs are updated implicitly in | |
2643 window matrices when they are manipulated via the frame matrix, | |
2644 window and frame matrix must of course agree where to find the | |
2645 glyphs for their rows. Possible manipulations that must be | |
2646 mirrored are assignments of rows of the desired frame matrix to the | |
2647 current frame matrix and scrolling the current frame matrix. */ | |
2648 | |
2649 /* Build frame F's desired matrix from window matrices. Only windows | |
2650 which have the flag must_be_updated_p set have to be updated. Menu | |
2651 bar lines of a frame are not covered by window matrices, so make | |
2652 sure not to touch them in this function. */ | |
2653 | |
2654 static void | |
2655 build_frame_matrix (f) | |
2656 struct frame *f; | |
2657 { | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2658 int i; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2659 |
25012 | 2660 /* F must have a frame matrix when this function is called. */ |
2661 xassert (!FRAME_WINDOW_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2662 |
25012 | 2663 /* Clear all rows in the frame matrix covered by window matrices. |
2664 Menu bar lines are not covered by windows. */ | |
2665 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i) | |
2666 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i)); | |
2667 | |
2668 /* Build the matrix by walking the window tree. */ | |
2669 build_frame_matrix_from_window_tree (f->desired_matrix, | |
2670 XWINDOW (FRAME_ROOT_WINDOW (f))); | |
2671 } | |
2672 | |
2673 | |
2674 /* Walk a window tree, building a frame matrix MATRIX from window | |
2675 matrices. W is the root of a window tree. */ | |
2676 | |
2677 static void | |
2678 build_frame_matrix_from_window_tree (matrix, w) | |
2679 struct glyph_matrix *matrix; | |
2680 struct window *w; | |
2681 { | |
2682 while (w) | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2683 { |
25012 | 2684 if (!NILP (w->hchild)) |
2685 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild)); | |
2686 else if (!NILP (w->vchild)) | |
2687 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild)); | |
2688 else | |
2689 build_frame_matrix_from_leaf_window (matrix, w); | |
2690 | |
2691 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
|
2692 } |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2693 } |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2694 |
25012 | 2695 |
2696 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the | |
2697 desired frame matrix built. W is a leaf window whose desired or | |
2698 current matrix is to be added to FRAME_MATRIX. W's flag | |
2699 must_be_updated_p determines which matrix it contributes to | |
2700 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix | |
2701 is added to FRAME_MATRIX, otherwise W's current matrix is added. | |
2702 Adding a desired matrix means setting up used counters and such in | |
2703 frame rows, while adding a current window matrix to FRAME_MATRIX | |
2704 means copying glyphs. The latter case corresponds to | |
2705 preserve_other_columns in the old redisplay. */ | |
2706 | |
2707 static void | |
2708 build_frame_matrix_from_leaf_window (frame_matrix, w) | |
2709 struct glyph_matrix *frame_matrix; | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2710 struct window *w; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2711 { |
25012 | 2712 struct glyph_matrix *window_matrix; |
2713 int window_y, frame_y; | |
2714 /* If non-zero, a glyph to insert at the right border of W. */ | |
2715 GLYPH right_border_glyph = 0; | |
2716 | |
2717 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */ | |
2718 if (w->must_be_updated_p) | |
2719 { | |
2720 window_matrix = w->desired_matrix; | |
2721 | |
2722 /* Decide whether we want to add a vertical border glyph. */ | |
2723 if (!WINDOW_RIGHTMOST_P (w)) | |
2724 { | |
2725 struct Lisp_Char_Table *dp = window_display_table (w); | |
63594
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2726 |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2727 right_border_glyph |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2728 = ((dp && INTEGERP (DISP_BORDER_GLYPH (dp))) |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2729 ? spec_glyph_lookup_face (w, XINT (DISP_BORDER_GLYPH (dp))) |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2730 : '|'); |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2731 |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2732 if (FAST_GLYPH_FACE (right_border_glyph) <= 0) |
4c33b0ac74a3
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-435
Miles Bader <miles@gnu.org>
parents:
63547
diff
changeset
|
2733 right_border_glyph |
63649
144440a09db1
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-438
Miles Bader <miles@gnu.org>
parents:
63594
diff
changeset
|
2734 = FAST_MAKE_GLYPH (right_border_glyph, VERTICAL_BORDER_FACE_ID); |
25012 | 2735 } |
2736 } | |
2737 else | |
2738 window_matrix = w->current_matrix; | |
2739 | |
2740 /* For all rows in the window matrix and corresponding rows in the | |
2741 frame matrix. */ | |
2742 window_y = 0; | |
2743 frame_y = window_matrix->matrix_y; | |
2744 while (window_y < window_matrix->nrows) | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2745 { |
25012 | 2746 struct glyph_row *frame_row = frame_matrix->rows + frame_y; |
2747 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
|
2748 int current_row_p = window_matrix == w->current_matrix; |
25012 | 2749 |
2750 /* Fill up the frame row with spaces up to the left margin of the | |
2751 window row. */ | |
2752 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x); | |
2753 | |
2754 /* Fill up areas in the window matrix row with spaces. */ | |
2755 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
|
2756 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2757 /* 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
|
2758 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
|
2759 row instead. */ |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2760 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
|
2761 && !window_row->enabled_p) |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2762 { |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2763 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
|
2764 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
|
2765 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2766 |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2767 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
|
2768 { |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2769 /* Copy window row to frame row. */ |
25012 | 2770 bcopy (window_row->glyphs[0], |
2771 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x, | |
2772 window_matrix->matrix_w * sizeof (struct glyph)); | |
2773 } | |
2774 else | |
2775 { | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2776 xassert (window_row->enabled_p); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2777 |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2778 /* 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
|
2779 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
|
2780 frame_row->enabled_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2781 |
25012 | 2782 /* Maybe insert a vertical border between horizontally adjacent |
2783 windows. */ | |
2784 if (right_border_glyph) | |
2785 { | |
2786 struct glyph *border = window_row->glyphs[LAST_AREA] - 1; | |
2787 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); | |
2788 } | |
2789 | |
59902
4a0a167cb6c4
(build_frame_matrix_from_leaf_window)
Kim F. Storm <storm@cua.dk>
parents:
59879
diff
changeset
|
2790 #if GLYPH_DEBUG |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2791 /* 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
|
2792 frame_y. */ |
25012 | 2793 xassert (glyph_row_slice_p (window_row, frame_row)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2794 |
25012 | 2795 /* If rows are in sync, we don't have to copy glyphs because |
2796 frame and window share glyphs. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2797 |
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2798 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
|
2799 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
|
2800 #endif |
25012 | 2801 } |
2802 | |
2803 /* Set number of used glyphs in the frame matrix. Since we fill | |
2804 up with spaces, and visit leaf windows from left to right it | |
2805 can be done simply. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2806 frame_row->used[TEXT_AREA] |
25012 | 2807 = window_matrix->matrix_x + window_matrix->matrix_w; |
2808 | |
2809 /* Next row. */ | |
2810 ++window_y; | |
2811 ++frame_y; | |
2812 } | |
2813 } | |
2814 | |
63547
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2815 /* Given a user-specified glyph, possibly including a Lisp-level face |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2816 ID, return a glyph that has a realized face ID. |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2817 This is used for glyphs displayed specially and not part of the text; |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2818 for instance, vertical separators, truncation markers, etc. */ |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2819 |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2820 GLYPH |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2821 spec_glyph_lookup_face (w, glyph) |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2822 struct window *w; |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2823 GLYPH glyph; |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2824 { |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2825 int lface_id = FAST_GLYPH_FACE (glyph); |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2826 /* Convert the glyph's specified face to a realized (cache) face. */ |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2827 if (lface_id > 0) |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2828 { |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2829 int face_id = merge_faces (XFRAME (w->frame), |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2830 Qt, lface_id, DEFAULT_FACE_ID); |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2831 glyph |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2832 = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), face_id); |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2833 } |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2834 return glyph; |
cbb687cf8169
(spec_glyph_lookup_face): New function.
Richard M. Stallman <rms@gnu.org>
parents:
61989
diff
changeset
|
2835 } |
25012 | 2836 |
2837 /* Add spaces to a glyph row ROW in a window matrix. | |
2838 | |
2839 Each row has the form: | |
2840 | |
2841 +---------+-----------------------------+------------+ | |
2842 | left | text | right | | |
2843 +---------+-----------------------------+------------+ | |
2844 | |
2845 Left and right marginal areas are optional. This function adds | |
2846 spaces to areas so that there are no empty holes between areas. | |
2847 In other words: If the right area is not empty, the text area | |
2848 is filled up with spaces up to the right area. If the text area | |
2849 is not empty, the left area is filled up. | |
2850 | |
2851 To be called for frame-based redisplay, only. */ | |
2852 | |
2853 static void | |
2854 fill_up_glyph_row_with_spaces (row) | |
2855 struct glyph_row *row; | |
2856 { | |
2857 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA); | |
2858 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA); | |
2859 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA); | |
2860 } | |
2861 | |
2862 | |
2863 /* Fill area AREA of glyph row ROW with spaces. To be called for | |
2864 frame-based redisplay only. */ | |
2865 | |
2866 static void | |
2867 fill_up_glyph_row_area_with_spaces (row, area) | |
2868 struct glyph_row *row; | |
2869 int area; | |
2870 { | |
2871 if (row->glyphs[area] < row->glyphs[area + 1]) | |
2872 { | |
2873 struct glyph *end = row->glyphs[area + 1]; | |
2874 struct glyph *text = row->glyphs[area] + row->used[area]; | |
2875 | |
2876 while (text < end) | |
2877 *text++ = space_glyph; | |
2878 row->used[area] = text - row->glyphs[area]; | |
2879 } | |
2880 } | |
2881 | |
2882 | |
2883 /* Add spaces to the end of ROW in a frame matrix until index UPTO is | |
2884 reached. In frame matrices only one area, TEXT_AREA, is used. */ | |
2885 | |
2886 static void | |
2887 fill_up_frame_row_with_spaces (row, upto) | |
2888 struct glyph_row *row; | |
2889 int upto; | |
2890 { | |
2891 int i = row->used[TEXT_AREA]; | |
2892 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2893 |
25012 | 2894 while (i < upto) |
2895 glyph[i++] = space_glyph; | |
2896 | |
2897 row->used[TEXT_AREA] = i; | |
2898 } | |
2899 | |
2900 | |
2901 | |
2902 /********************************************************************** | |
2903 Mirroring operations on frame matrices in window matrices | |
2904 **********************************************************************/ | |
2905 | |
2906 /* Set frame being updated via frame-based redisplay to F. This | |
2907 function must be called before updates to make explicit that we are | |
2908 working on frame matrices or not. */ | |
2909 | |
2910 static INLINE void | |
2911 set_frame_matrix_frame (f) | |
2912 struct frame *f; | |
2913 { | |
2914 frame_matrix_frame = f; | |
2915 } | |
2916 | |
2917 | |
2918 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date. | |
2919 DESIRED_MATRIX is the desired matrix corresponding to | |
2920 CURRENT_MATRIX. The update is done by exchanging glyph pointers | |
2921 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If | |
2922 frame_matrix_frame is non-null, this indicates that the exchange is | |
2923 done in frame matrices, and that we have to perform analogous | |
2924 operations in window matrices of frame_matrix_frame. */ | |
2925 | |
2926 static INLINE void | |
2927 make_current (desired_matrix, current_matrix, row) | |
2928 struct glyph_matrix *desired_matrix, *current_matrix; | |
2929 int row; | |
2930 { | |
2931 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); | |
2932 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
|
2933 int mouse_face_p = current_row->mouse_face_p; |
25012 | 2934 |
2935 /* Do current_row = desired_row. This exchanges glyph pointers | |
2936 between both rows, and does a structure assignment otherwise. */ | |
2937 assign_row (current_row, desired_row); | |
2938 | |
2939 /* Enable current_row to mark it as valid. */ | |
2940 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
|
2941 current_row->mouse_face_p = mouse_face_p; |
25012 | 2942 |
2943 /* If we are called on frame matrices, perform analogous operations | |
2944 for window matrices. */ | |
2945 if (frame_matrix_frame) | |
2946 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row); | |
2947 } | |
2948 | |
2949 | |
2950 /* W is the root of a window tree. FRAME_ROW is the index of a row in | |
2951 W's frame which has been made current (by swapping pointers between | |
2952 current and desired matrix). Perform analogous operations in the | |
2953 matrices of leaf windows in the window tree rooted at W. */ | |
2954 | |
2955 static void | |
2956 mirror_make_current (w, frame_row) | |
2957 struct window *w; | |
2958 int frame_row; | |
2959 { | |
2960 while (w) | |
2961 { | |
2962 if (!NILP (w->hchild)) | |
2963 mirror_make_current (XWINDOW (w->hchild), frame_row); | |
2964 else if (!NILP (w->vchild)) | |
2965 mirror_make_current (XWINDOW (w->vchild), frame_row); | |
2966 else | |
2967 { | |
2968 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS | |
2969 here because the checks performed in debug mode there | |
2970 will not allow the conversion. */ | |
2971 int row = frame_row - w->desired_matrix->matrix_y; | |
2972 | |
2973 /* If FRAME_ROW is within W, assign the desired row to the | |
2974 current row (exchanging glyph pointers). */ | |
2975 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
|
2976 { |
25012 | 2977 struct glyph_row *current_row |
2978 = MATRIX_ROW (w->current_matrix, row); | |
2979 struct glyph_row *desired_row | |
2980 = 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
|
2981 |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2982 if (desired_row->enabled_p) |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2983 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
|
2984 else |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2985 swap_glyph_pointers (desired_row, current_row); |
25012 | 2986 current_row->enabled_p = 1; |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2987 } |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2988 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2989 |
25012 | 2990 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2991 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2992 } |
25012 | 2993 |
2994 | |
2995 /* Perform row dance after scrolling. We are working on the range of | |
2996 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not | |
2997 including) in MATRIX. COPY_FROM is a vector containing, for each | |
2998 row I in the range 0 <= I < NLINES, the index of the original line | |
2999 to move to I. This index is relative to the row range, i.e. 0 <= | |
3000 index < NLINES. RETAINED_P is a vector containing zero for each | |
3001 row 0 <= I < NLINES which is empty. | |
3002 | |
3003 This function is called from do_scrolling and do_direct_scrolling. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3004 |
25012 | 3005 void |
3006 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, | |
3007 retained_p) | |
3008 struct glyph_matrix *matrix; | |
3009 int unchanged_at_top, nlines; | |
3010 int *copy_from; | |
3011 char *retained_p; | |
3012 { | |
3013 /* A copy of original rows. */ | |
3014 struct glyph_row *old_rows; | |
3015 | |
3016 /* Rows to assign to. */ | |
3017 struct glyph_row *new_rows = MATRIX_ROW (matrix, unchanged_at_top); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3018 |
25012 | 3019 int i; |
3020 | |
3021 /* Make a copy of the original rows. */ | |
3022 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows); | |
3023 bcopy (new_rows, old_rows, nlines * sizeof *old_rows); | |
3024 | |
3025 /* Assign new rows, maybe clear lines. */ | |
3026 for (i = 0; i < nlines; ++i) | |
3027 { | |
3028 int enabled_before_p = new_rows[i].enabled_p; | |
3029 | |
3030 xassert (i + unchanged_at_top < matrix->nrows); | |
3031 xassert (unchanged_at_top + copy_from[i] < matrix->nrows); | |
3032 new_rows[i] = old_rows[copy_from[i]]; | |
3033 new_rows[i].enabled_p = enabled_before_p; | |
3034 | |
3035 /* RETAINED_P is zero for empty lines. */ | |
3036 if (!retained_p[copy_from[i]]) | |
3037 new_rows[i].enabled_p = 0; | |
3038 } | |
3039 | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3040 /* Do the same for window matrices, if MATRIX is a frame matrix. */ |
25012 | 3041 if (frame_matrix_frame) |
3042 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window), | |
3043 unchanged_at_top, nlines, copy_from, retained_p); | |
3044 } | |
3045 | |
3046 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3047 /* Synchronize glyph pointers in the current matrix of window W with |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3048 the current frame matrix. */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3049 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3050 static void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3051 sync_window_with_frame_matrix_rows (w) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3052 struct window *w; |
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 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3055 struct glyph_row *window_row, *window_row_end, *frame_row; |
40271
ae4848857075
(sync_window_with_frame_matrix_rows): Remove unused variable `area'.
Pavel Janík <Pavel@Janik.cz>
parents:
40214
diff
changeset
|
3056 int left, right, x, width; |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3057 |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3058 /* Preconditions: W must be a leaf window on a tty frame. */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3059 xassert (NILP (w->hchild) && NILP (w->vchild)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3060 xassert (!FRAME_WINDOW_P (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3061 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3062 left = margin_glyphs_to_reserve (w, 1, w->left_margin_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3063 right = margin_glyphs_to_reserve (w, 1, w->right_margin_cols); |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3064 x = w->current_matrix->matrix_x; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3065 width = w->current_matrix->matrix_w; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3066 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3067 window_row = w->current_matrix->rows; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3068 window_row_end = window_row + w->current_matrix->nrows; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3069 frame_row = f->current_matrix->rows + WINDOW_TOP_EDGE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3070 |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3071 for (; window_row < window_row_end; ++window_row, ++frame_row) |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3072 { |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3073 window_row->glyphs[LEFT_MARGIN_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3074 = frame_row->glyphs[0] + x; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3075 window_row->glyphs[TEXT_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3076 = window_row->glyphs[LEFT_MARGIN_AREA] + left; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3077 window_row->glyphs[LAST_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3078 = window_row->glyphs[LEFT_MARGIN_AREA] + width; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3079 window_row->glyphs[RIGHT_MARGIN_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3080 = window_row->glyphs[LAST_AREA] - right; |
27855
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 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3083 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3084 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3085 /* 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
|
3086 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
|
3087 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3088 struct window * |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3089 frame_row_to_window (w, row) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3090 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3091 int row; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3092 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3093 struct window *found = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3094 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3095 while (w && !found) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3096 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3097 if (!NILP (w->hchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3098 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
|
3099 else if (!NILP (w->vchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3100 found = frame_row_to_window (XWINDOW (w->vchild), row); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3101 else if (row >= WINDOW_TOP_EDGE_LINE (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3102 && row < WINDOW_BOTTOM_EDGE_LINE (w)) |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3103 found = w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3104 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3105 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3106 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3107 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3108 return found; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3109 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3110 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3111 |
25012 | 3112 /* Perform a line dance in the window tree rooted at W, after |
3113 scrolling a frame matrix in mirrored_line_dance. | |
3114 | |
3115 We are working on the range of lines UNCHANGED_AT_TOP + 1 to | |
3116 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix. | |
3117 COPY_FROM is a vector containing, for each row I in the range 0 <= | |
3118 I < NLINES, the index of the original line to move to I. This | |
3119 index is relative to the row range, i.e. 0 <= index < NLINES. | |
3120 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES | |
3121 which is empty. */ | |
3122 | |
3123 static void | |
3124 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) | |
3125 struct window *w; | |
3126 int unchanged_at_top, nlines; | |
3127 int *copy_from; | |
3128 char *retained_p; | |
3129 { | |
3130 while (w) | |
3131 { | |
3132 if (!NILP (w->hchild)) | |
3133 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top, | |
3134 nlines, copy_from, retained_p); | |
3135 else if (!NILP (w->vchild)) | |
3136 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top, | |
3137 nlines, copy_from, retained_p); | |
3138 else | |
3139 { | |
3140 /* W is a leaf window, and we are working on its current | |
3141 matrix m. */ | |
3142 struct glyph_matrix *m = w->current_matrix; | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3143 int i, sync_p = 0; |
25012 | 3144 struct glyph_row *old_rows; |
3145 | |
3146 /* Make a copy of the original rows of matrix m. */ | |
3147 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows); | |
3148 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows); | |
3149 | |
3150 for (i = 0; i < nlines; ++i) | |
3151 { | |
3152 /* Frame relative line assigned to. */ | |
3153 int frame_to = i + unchanged_at_top; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3154 |
25012 | 3155 /* Frame relative line assigned. */ |
3156 int frame_from = copy_from[i] + unchanged_at_top; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3157 |
25012 | 3158 /* Window relative line assigned to. */ |
3159 int window_to = frame_to - m->matrix_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3160 |
25012 | 3161 /* Window relative line assigned. */ |
3162 int window_from = frame_from - m->matrix_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3163 |
25012 | 3164 /* Is assigned line inside window? */ |
3165 int from_inside_window_p | |
3166 = window_from >= 0 && window_from < m->matrix_h; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3167 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3168 /* Is assigned to line inside window? */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3169 int to_inside_window_p |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3170 = window_to >= 0 && window_to < m->matrix_h; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3171 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3172 if (from_inside_window_p && to_inside_window_p) |
25012 | 3173 { |
3174 /* Enabled setting before assignment. */ | |
3175 int enabled_before_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3176 |
25012 | 3177 /* Do the assignment. The enabled_p flag is saved |
3178 over the assignment because the old redisplay did | |
3179 that. */ | |
3180 enabled_before_p = m->rows[window_to].enabled_p; | |
3181 m->rows[window_to] = old_rows[window_from]; | |
3182 m->rows[window_to].enabled_p = enabled_before_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3183 |
25012 | 3184 /* If frame line is empty, window line is empty, too. */ |
3185 if (!retained_p[copy_from[i]]) | |
3186 m->rows[window_to].enabled_p = 0; | |
3187 } | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3188 else if (to_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3189 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3190 /* A copy between windows. This is an infrequent |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3191 case not worth optimizing. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3192 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3193 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3194 struct window *w2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3195 struct glyph_matrix *m2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3196 int m2_from; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3197 |
60684
18bf961ed63a
(mirror_line_dance): Set W2 according to FRAME_FROM.
Richard M. Stallman <rms@gnu.org>
parents:
59905
diff
changeset
|
3198 w2 = frame_row_to_window (root, frame_from); |
61416
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3199 /* ttn@surf.glug.org: when enabling menu bar using `emacs |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3200 -nw', FROM_FRAME sometimes has no associated window. |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3201 This check avoids a segfault if W2 is null. */ |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3202 if (w2) |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3203 { |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3204 m2 = w2->current_matrix; |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3205 m2_from = frame_from - m2->matrix_y; |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3206 copy_row_except_pointers (m->rows + window_to, |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3207 m2->rows + m2_from); |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3208 |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3209 /* If frame line is empty, window line is empty, too. */ |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3210 if (!retained_p[copy_from[i]]) |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3211 m->rows[window_to].enabled_p = 0; |
89b8166ef056
(mirror_line_dance): Avoid crash if W2 is null.
Richard M. Stallman <rms@gnu.org>
parents:
60684
diff
changeset
|
3212 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3213 sync_p = 1; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3214 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3215 else if (from_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3216 sync_p = 1; |
25012 | 3217 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3218 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3219 /* 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
|
3220 pointers are in sync with the frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3221 if (sync_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3222 sync_window_with_frame_matrix_rows (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3223 |
25012 | 3224 /* Check that no pointers are lost. */ |
3225 CHECK_MATRIX (m); | |
3226 } | |
3227 | |
3228 /* Next window on same level. */ | |
3229 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3230 } | |
3231 } | |
3232 | |
3233 | |
3234 #if GLYPH_DEBUG | |
3235 | |
3236 /* Check that window and frame matrices agree about their | |
3237 understanding where glyphs of the rows are to find. For each | |
3238 window in the window tree rooted at W, check that rows in the | |
3239 matrices of leaf window agree with their frame matrices about | |
3240 glyph pointers. */ | |
314 | 3241 |
21514 | 3242 void |
25012 | 3243 check_window_matrix_pointers (w) |
314 | 3244 struct window *w; |
3245 { | |
25012 | 3246 while (w) |
3247 { | |
3248 if (!NILP (w->hchild)) | |
3249 check_window_matrix_pointers (XWINDOW (w->hchild)); | |
3250 else if (!NILP (w->vchild)) | |
3251 check_window_matrix_pointers (XWINDOW (w->vchild)); | |
3252 else | |
3253 { | |
3254 struct frame *f = XFRAME (w->frame); | |
3255 check_matrix_pointers (w->desired_matrix, f->desired_matrix); | |
3256 check_matrix_pointers (w->current_matrix, f->current_matrix); | |
3257 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3258 |
25012 | 3259 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
3260 } | |
3261 } | |
3262 | |
3263 | |
3264 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is | |
3265 a window and FRAME_MATRIX is the corresponding frame matrix. For | |
3266 each row in WINDOW_MATRIX check that it's a slice of the | |
3267 corresponding frame row. If it isn't, abort. */ | |
3268 | |
3269 static void | |
3270 check_matrix_pointers (window_matrix, frame_matrix) | |
3271 struct glyph_matrix *window_matrix, *frame_matrix; | |
3272 { | |
3273 /* Row number in WINDOW_MATRIX. */ | |
3274 int i = 0; | |
3275 | |
3276 /* Row number corresponding to I in FRAME_MATRIX. */ | |
3277 int j = window_matrix->matrix_y; | |
3278 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3279 /* For all rows check that the row in the window matrix is a |
25012 | 3280 slice of the row in the frame matrix. If it isn't we didn't |
3281 mirror an operation on the frame matrix correctly. */ | |
3282 while (i < window_matrix->nrows) | |
3283 { | |
3284 if (!glyph_row_slice_p (window_matrix->rows + i, | |
3285 frame_matrix->rows + j)) | |
3286 abort (); | |
3287 ++i, ++j; | |
3288 } | |
3289 } | |
3290 | |
3291 #endif /* GLYPH_DEBUG != 0 */ | |
3292 | |
3293 | |
3294 | |
3295 /********************************************************************** | |
3296 VPOS and HPOS translations | |
3297 **********************************************************************/ | |
3298 | |
3299 #if GLYPH_DEBUG | |
3300 | |
3301 /* Translate vertical position VPOS which is relative to window W to a | |
3302 vertical position relative to W's frame. */ | |
3303 | |
3304 static int | |
3305 window_to_frame_vpos (w, vpos) | |
3306 struct window *w; | |
3307 int vpos; | |
3308 { | |
3309 struct frame *f = XFRAME (w->frame); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3310 |
25012 | 3311 xassert (!FRAME_WINDOW_P (f)); |
3312 xassert (vpos >= 0 && vpos <= w->desired_matrix->nrows); | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3313 vpos += WINDOW_TOP_EDGE_LINE (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3314 xassert (vpos >= 0 && vpos <= FRAME_LINES (f)); |
25012 | 3315 return vpos; |
3316 } | |
3317 | |
3318 | |
3319 /* Translate horizontal position HPOS which is relative to window W to | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3320 a horizontal position relative to W's frame. */ |
25012 | 3321 |
3322 static int | |
3323 window_to_frame_hpos (w, hpos) | |
3324 struct window *w; | |
3325 int hpos; | |
3326 { | |
65308
7b2a711dc863
(window_to_frame_hpos, update_window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65016
diff
changeset
|
3327 xassert (!FRAME_WINDOW_P (XFRAME (w->frame))); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3328 hpos += WINDOW_LEFT_EDGE_COL (w); |
25012 | 3329 return hpos; |
314 | 3330 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3331 |
25012 | 3332 #endif /* GLYPH_DEBUG */ |
3333 | |
3334 | |
314 | 3335 |
25012 | 3336 /********************************************************************** |
3337 Redrawing Frames | |
3338 **********************************************************************/ | |
3339 | |
3340 DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0, | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
3341 doc: /* Clear frame FRAME and output again what is supposed to appear on it. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
3342 (frame) |
25012 | 3343 Lisp_Object frame; |
3344 { | |
3345 struct frame *f; | |
3346 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
3347 CHECK_LIVE_FRAME (frame); |
25012 | 3348 f = XFRAME (frame); |
3349 | |
3350 /* Ignore redraw requests, if frame has no glyphs yet. | |
3351 (Implementation note: It still has to be checked why we are | |
3352 called so early here). */ | |
3353 if (!glyphs_initialized_initially_p) | |
3354 return Qnil; | |
3355 | |
3356 update_begin (f); | |
35445
9af454aee182
(Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents:
35374
diff
changeset
|
3357 if (FRAME_MSDOS_P (f)) |
25012 | 3358 set_terminal_modes (); |
3359 clear_frame (); | |
3360 clear_current_matrices (f); | |
3361 update_end (f); | |
3362 fflush (stdout); | |
3363 windows_or_buffers_changed++; | |
3364 /* Mark all windows as inaccurate, so that every window will have | |
3365 its redisplay done. */ | |
3366 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0); | |
3367 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
3368 f->garbaged = 0; | |
3369 return Qnil; | |
3370 } | |
3371 | |
3372 | |
3373 /* Redraw frame F. This is nothing more than a call to the Lisp | |
3374 function redraw-frame. */ | |
3375 | |
3376 void | |
3377 redraw_frame (f) | |
3378 struct frame *f; | |
3379 { | |
3380 Lisp_Object frame; | |
3381 XSETFRAME (frame, f); | |
3382 Fredraw_frame (frame); | |
3383 } | |
3384 | |
3385 | |
3386 DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "", | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
3387 doc: /* Clear and redisplay all visible frames. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
3388 () |
25012 | 3389 { |
3390 Lisp_Object tail, frame; | |
3391 | |
3392 FOR_EACH_FRAME (tail, frame) | |
3393 if (FRAME_VISIBLE_P (XFRAME (frame))) | |
3394 Fredraw_frame (frame); | |
3395 | |
3396 return Qnil; | |
3397 } | |
3398 | |
3399 | |
3400 /* This is used when frame_garbaged is set. Call Fredraw_frame on all | |
3401 visible frames marked as garbaged. */ | |
3402 | |
3403 void | |
3404 redraw_garbaged_frames () | |
3405 { | |
3406 Lisp_Object tail, frame; | |
3407 | |
3408 FOR_EACH_FRAME (tail, frame) | |
3409 if (FRAME_VISIBLE_P (XFRAME (frame)) | |
3410 && FRAME_GARBAGED_P (XFRAME (frame))) | |
3411 Fredraw_frame (frame); | |
3412 } | |
3413 | |
3414 | |
3415 | |
3416 /*********************************************************************** | |
3417 Direct Operations | |
3418 ***********************************************************************/ | |
3419 | |
3420 /* Try to update display and current glyph matrix directly. | |
3421 | |
3422 This function is called after a character G has been inserted into | |
3423 current_buffer. It tries to update the current glyph matrix and | |
3424 perform appropriate screen output to reflect the insertion. If it | |
3425 succeeds, the global flag redisplay_performed_directly_p will be | |
3426 set to 1, and thereby prevent the more costly general redisplay | |
3427 from running (see redisplay_internal). | |
3428 | |
3429 This function is not called for `hairy' character insertions. | |
3430 In particular, it is not called when after or before change | |
3431 functions exist, like they are used by font-lock. See keyboard.c | |
3432 for details where this function is called. */ | |
314 | 3433 |
3434 int | |
3435 direct_output_for_insert (g) | |
3436 int g; | |
3437 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3438 register struct frame *f = SELECTED_FRAME (); |
25012 | 3439 struct window *w = XWINDOW (selected_window); |
3440 struct it it, it2; | |
3441 struct glyph_row *glyph_row; | |
3442 struct glyph *glyphs, *glyph, *end; | |
3443 int n; | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3444 /* Non-null means that redisplay of W is based on window matrices. */ |
25012 | 3445 int window_redisplay_p = FRAME_WINDOW_P (f); |
3446 /* Non-null means we are in overwrite mode. */ | |
3447 int overwrite_p = !NILP (current_buffer->overwrite_mode); | |
3448 int added_width; | |
3449 struct text_pos pos; | |
3450 int delta, delta_bytes; | |
3451 | |
3452 /* Not done directly. */ | |
3453 redisplay_performed_directly_p = 0; | |
3454 | |
3455 /* Quickly give up for some common cases. */ | |
3456 if (cursor_in_echo_area | |
3457 /* Give up if fonts have changed. */ | |
3458 || fonts_changed_p | |
3459 /* Give up if face attributes have been changed. */ | |
3460 || face_change_count | |
3461 /* Give up if cursor position not really known. */ | |
314 | 3462 || !display_completed |
25012 | 3463 /* Give up if buffer appears in two places. */ |
314 | 3464 || buffer_shared > 1 |
34715
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3465 /* 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
|
3466 minibuffer contents. */ |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3467 || (EQ (selected_window, minibuf_window) |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3468 && EQ (minibuf_window, echo_area_window)) |
25012 | 3469 /* Give up for hscrolled mini-buffer because display of the prompt |
3470 is handled specially there (see display_line). */ | |
3471 || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll)) | |
3472 /* Give up if overwriting in the middle of a line. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3473 || (overwrite_p |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3474 && PT != ZV |
25012 | 3475 && FETCH_BYTE (PT) != '\n') |
3476 /* Give up for tabs and line ends. */ | |
3477 || g == '\t' | |
3478 || g == '\n' | |
3479 || g == '\r' | |
3480 /* Give up if unable to display the cursor in the window. */ | |
3481 || 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
|
3482 /* 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
|
3483 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
|
3484 || !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
|
3485 || !NILP (echo_area_buffer[1]) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3486 || (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
|
3487 /* 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
|
3488 lines would change. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3489 (glyph_row->continued_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3490 || glyph_row->exact_window_width_line_p |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3491 /* 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
|
3492 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
|
3493 have to be redisplayed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3494 || glyph_row->overlapping_p |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3495 || glyph_row->overlapped_p)) |
25012 | 3496 /* Can't do it for partial width windows on terminal frames |
3497 because we can't clear to eol in such a window. */ | |
3498 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w))) | |
3499 return 0; | |
3500 | |
35374
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3501 /* 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
|
3502 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
|
3503 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
|
3504 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
|
3505 return 0; |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3506 |
25012 | 3507 /* Set up a display iterator structure for W. Glyphs will be |
3508 produced in scratch_glyph_row. Current position is W's cursor | |
3509 position. */ | |
3510 clear_glyph_row (&scratch_glyph_row); | |
3511 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
|
3512 DEC_TEXT_POS (pos, !NILP (current_buffer->enable_multibyte_characters)); |
25012 | 3513 init_iterator (&it, w, CHARPOS (pos), BYTEPOS (pos), &scratch_glyph_row, |
3514 DEFAULT_FACE_ID); | |
3515 | |
3516 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
|
3517 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
|
3518 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3519 |
25012 | 3520 /* Give up if highlighting trailing whitespace and we have trailing |
3521 whitespace in glyph_row. We would have to remove the trailing | |
3522 whitespace face in that case. */ | |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3523 if (!NILP (Vshow_trailing_whitespace) |
25012 | 3524 && glyph_row->used[TEXT_AREA]) |
3525 { | |
3526 struct glyph *last; | |
3527 | |
3528 last = glyph_row->glyphs[TEXT_AREA] + glyph_row->used[TEXT_AREA] - 1; | |
3529 if (last->type == STRETCH_GLYPH | |
3530 || (last->type == CHAR_GLYPH | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
3531 && last->u.ch == ' ')) |
25012 | 3532 return 0; |
3533 } | |
3534 | |
3535 /* Give up if there are overlay strings at pos. This would fail | |
3536 if the overlay string has newlines in it. */ | |
3537 if (STRINGP (it.string)) | |
3538 return 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3539 |
25012 | 3540 it.hpos = w->cursor.hpos; |
3541 it.vpos = w->cursor.vpos; | |
3542 it.current_x = w->cursor.x + it.first_visible_x; | |
3543 it.current_y = w->cursor.y; | |
3544 it.end_charpos = PT; | |
3545 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
|
3546 it.stop_charpos = max (IT_CHARPOS (it), it.stop_charpos); |
25012 | 3547 |
3548 /* More than one display element may be returned for PT - 1 if | |
3549 (i) it's a control character which is translated into `\003' or | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3550 `^C', or (ii) it has a display table entry, or (iii) it's a |
25012 | 3551 combination of both. */ |
3552 delta = delta_bytes = 0; | |
3553 while (get_next_display_element (&it)) | |
3554 { | |
3555 PRODUCE_GLYPHS (&it); | |
3556 | |
3557 /* Give up if glyph doesn't fit completely on the line. */ | |
3558 if (it.current_x >= it.last_visible_x) | |
3559 return 0; | |
3560 | |
3561 /* Give up if new glyph has different ascent or descent than | |
3562 the original row, or if it is not a character glyph. */ | |
3563 if (glyph_row->ascent != it.ascent | |
3564 || 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
|
3565 || glyph_row->phys_ascent != it.phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3566 || glyph_row->phys_height != it.phys_ascent + it.phys_descent |
25012 | 3567 || it.what != IT_CHARACTER) |
3568 return 0; | |
3569 | |
3570 delta += 1; | |
3571 delta_bytes += it.len; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3572 set_iterator_to_next (&it, 1); |
25012 | 3573 } |
3574 | |
3575 /* Give up if we hit the right edge of the window. We would have | |
3576 to insert truncation or continuation glyphs. */ | |
3577 added_width = it.current_x - (w->cursor.x + it.first_visible_x); | |
3578 if (glyph_row->pixel_width + added_width >= it.last_visible_x) | |
314 | 3579 return 0; |
3580 | |
25012 | 3581 /* Give up if there is a \t following in the line. */ |
3582 it2 = it; | |
3583 it2.end_charpos = ZV; | |
3584 it2.stop_charpos = min (it2.stop_charpos, ZV); | |
3585 while (get_next_display_element (&it2) | |
3586 && !ITERATOR_AT_END_OF_LINE_P (&it2)) | |
3587 { | |
3588 if (it2.c == '\t') | |
3589 return 0; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3590 set_iterator_to_next (&it2, 1); |
25012 | 3591 } |
3592 | |
3593 /* Number of new glyphs produced. */ | |
3594 n = it.glyph_row->used[TEXT_AREA]; | |
3595 | |
3596 /* Start and end of glyphs in original row. */ | |
3597 glyphs = glyph_row->glyphs[TEXT_AREA] + w->cursor.hpos; | |
3598 end = glyph_row->glyphs[1 + TEXT_AREA]; | |
3599 | |
3600 /* Make room for new glyphs, then insert them. */ | |
3601 xassert (end - glyphs - n >= 0); | |
25781
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3602 safe_bcopy ((char *) glyphs, (char *) (glyphs + n), |
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3603 (end - glyphs - n) * sizeof (*end)); |
25012 | 3604 bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs); |
3605 glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n, | |
3606 end - glyph_row->glyphs[TEXT_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3607 |
25012 | 3608 /* Compute new line width. */ |
3609 glyph = glyph_row->glyphs[TEXT_AREA]; | |
3610 end = glyph + glyph_row->used[TEXT_AREA]; | |
3611 glyph_row->pixel_width = glyph_row->x; | |
3612 while (glyph < end) | |
3613 { | |
3614 glyph_row->pixel_width += glyph->pixel_width; | |
3615 ++glyph; | |
3616 } | |
3617 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3618 /* Increment buffer positions for glyphs following the newly |
25012 | 3619 inserted ones. */ |
3620 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
|
3621 if (glyph->charpos > 0 && BUFFERP (glyph->object)) |
25012 | 3622 glyph->charpos += delta; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3623 |
25012 | 3624 if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0) |
3625 { | |
3626 MATRIX_ROW_END_CHARPOS (glyph_row) += delta; | |
3627 MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes; | |
3628 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3629 |
25012 | 3630 /* 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
|
3631 increment_matrix_positions (w->current_matrix, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3632 w->cursor.vpos + 1, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3633 w->current_matrix->nrows, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3634 delta, delta_bytes); |
25012 | 3635 |
3636 glyph_row->contains_overlapping_glyphs_p | |
3637 |= it.glyph_row->contains_overlapping_glyphs_p; | |
3638 | |
26591
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3639 glyph_row->displays_text_p = 1; |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3640 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
|
3641 XFASTINT (w->window_end_vpos))); |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3642 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3643 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 3644 highlight_trailing_whitespace (it.f, glyph_row); |
3645 | |
3646 /* Write glyphs. If at end of row, we can simply call write_glyphs. | |
3647 In the middle, we have to insert glyphs. Note that this is now | |
3648 implemented for X frames. The implementation uses updated_window | |
3649 and updated_row. */ | |
3650 updated_row = glyph_row; | |
38988
53ae5a92e2fc
(direct_output_for_insert): Set updated_area
Gerd Moellmann <gerd@gnu.org>
parents:
38748
diff
changeset
|
3651 updated_area = TEXT_AREA; |
25012 | 3652 update_begin (f); |
3653 if (rif) | |
3654 { | |
3655 rif->update_window_begin_hook (w); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3656 |
36115
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3657 if (glyphs == end - n |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3658 /* 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
|
3659 || (glyphs == end - n - 1 |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3660 && (end - n)->charpos <= 0)) |
25012 | 3661 rif->write_glyphs (glyphs, n); |
3662 else | |
3663 rif->insert_glyphs (glyphs, n); | |
3664 } | |
3665 else | |
3666 { | |
3667 if (glyphs == end - n) | |
3668 write_glyphs (glyphs, n); | |
3669 else | |
3670 insert_glyphs (glyphs, n); | |
3671 } | |
3672 | |
3673 w->cursor.hpos += n; | |
3674 w->cursor.x = it.current_x - it.first_visible_x; | |
3675 xassert (w->cursor.hpos >= 0 | |
3676 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
3677 | |
3678 /* How to set the cursor differs depending on whether we are | |
3679 using a frame matrix or a window matrix. Note that when | |
3680 a frame matrix is used, cursor_to expects frame coordinates, | |
3681 and the X and Y parameters are not used. */ | |
3682 if (window_redisplay_p) | |
3683 rif->cursor_to (w->cursor.vpos, w->cursor.hpos, | |
3684 w->cursor.y, w->cursor.x); | |
3685 else | |
3686 { | |
3687 int x, y; | |
3688 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos) | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3689 + (INTEGERP (w->left_margin_cols) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3690 ? XFASTINT (w->left_margin_cols) |
25012 | 3691 : 0)); |
3692 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
3693 cursor_to (y, x); | |
3694 } | |
3695 | |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
3696 #ifdef HAVE_WINDOW_SYSTEM |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3697 update_window_fringes (w, 0); |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
3698 #endif |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3699 |
25012 | 3700 if (rif) |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3701 rif->update_window_end_hook (w, 1, 0); |
25012 | 3702 update_end (f); |
3703 updated_row = NULL; | |
3704 fflush (stdout); | |
3705 | |
3706 TRACE ((stderr, "direct output for insert\n")); | |
44260
64c67a3eebb2
(direct_output_for_insert): Call
Gerd Moellmann <gerd@gnu.org>
parents:
43729
diff
changeset
|
3707 mark_window_display_accurate (it.window, 1); |
25012 | 3708 redisplay_performed_directly_p = 1; |
314 | 3709 return 1; |
3710 } | |
3711 | |
25012 | 3712 |
3713 /* Perform a direct display update for moving PT by N positions | |
3714 left or right. N < 0 means a movement backwards. This function | |
3715 is currently only called for N == 1 or N == -1. */ | |
3716 | |
314 | 3717 int |
3718 direct_output_forward_char (n) | |
3719 int n; | |
3720 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3721 struct frame *f = SELECTED_FRAME (); |
25012 | 3722 struct window *w = XWINDOW (selected_window); |
3723 struct glyph_row *row; | |
3724 | |
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3725 /* 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
|
3726 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
|
3727 current_buffer, PT)) |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3728 return 0; |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3729 |
25012 | 3730 /* Give up if face attributes have been changed. */ |
3731 if (face_change_count) | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
3732 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3733 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3734 /* Give up if current matrix is not up to date or we are |
25012 | 3735 displaying a message. */ |
3736 if (!display_completed || cursor_in_echo_area) | |
3737 return 0; | |
3738 | |
3739 /* Give up if the buffer's direction is reversed. */ | |
3740 if (!NILP (XBUFFER (w->buffer)->direction_reversed)) | |
314 | 3741 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
|
3742 |
2794
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3743 /* 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
|
3744 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
|
3745 return 0; |
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3746 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3747 /* Can't use direct output if highlighting trailing whitespace. */ |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3748 if (!NILP (Vshow_trailing_whitespace)) |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3749 return 0; |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3750 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3751 /* 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
|
3752 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
|
3753 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
|
3754 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3755 |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3756 /* 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
|
3757 minibuffer contents. */ |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3758 if (XWINDOW (minibuf_window) == w |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3759 && EQ (minibuf_window, echo_area_window)) |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3760 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3761 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3762 /* 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
|
3763 if (w->cursor.vpos < 0) |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3764 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3765 |
25012 | 3766 row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); |
3767 | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
3768 /* Give up if PT is outside of the last known cursor row. */ |
41069
818a84568f83
(direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents:
41025
diff
changeset
|
3769 if (PT <= MATRIX_ROW_START_CHARPOS (row) |
818a84568f83
(direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents:
41025
diff
changeset
|
3770 || PT >= MATRIX_ROW_END_CHARPOS (row)) |
6069
07045ca8ff19
(direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
6068
diff
changeset
|
3771 return 0; |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
3772 |
25012 | 3773 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3774 |
25012 | 3775 w->last_cursor = w->cursor; |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15896
diff
changeset
|
3776 XSETFASTINT (w->last_point, PT); |
25012 | 3777 |
3778 xassert (w->cursor.hpos >= 0 | |
3779 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3780 |
25012 | 3781 if (FRAME_WINDOW_P (f)) |
3782 rif->cursor_to (w->cursor.vpos, w->cursor.hpos, | |
3783 w->cursor.y, w->cursor.x); | |
3784 else | |
3785 { | |
3786 int x, y; | |
3787 x = (WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos) | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3788 + (INTEGERP (w->left_margin_cols) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3789 ? XFASTINT (w->left_margin_cols) |
25012 | 3790 : 0)); |
3791 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
3792 cursor_to (y, x); | |
3793 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3794 |
314 | 3795 fflush (stdout); |
25012 | 3796 redisplay_performed_directly_p = 1; |
314 | 3797 return 1; |
3798 } | |
25012 | 3799 |
3800 | |
314 | 3801 |
25012 | 3802 /*********************************************************************** |
3803 Frame Update | |
3804 ***********************************************************************/ | |
3805 | |
3806 /* Update frame F based on the data in desired matrices. | |
3807 | |
3808 If FORCE_P is non-zero, don't let redisplay be stopped by detecting | |
3809 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try | |
3810 scrolling. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3811 |
25012 | 3812 Value is non-zero if redisplay was stopped due to pending input. */ |
314 | 3813 |
3814 int | |
25012 | 3815 update_frame (f, force_p, inhibit_hairy_id_p) |
3816 struct frame *f; | |
3817 int force_p; | |
3818 int inhibit_hairy_id_p; | |
3819 { | |
3820 /* 1 means display has been paused because of pending input. */ | |
3821 int paused_p; | |
3822 struct window *root_window = XWINDOW (f->root_window); | |
3823 | |
3824 if (FRAME_WINDOW_P (f)) | |
3825 { | |
3826 /* We are working on window matrix basis. All windows whose | |
3827 flag must_be_updated_p is set have to be updated. */ | |
3828 | |
3829 /* Record that we are not working on frame matrices. */ | |
3830 set_frame_matrix_frame (NULL); | |
3831 | |
3832 /* Update all windows in the window tree of F, maybe stopping | |
3833 when pending input is detected. */ | |
3834 update_begin (f); | |
3835 | |
3836 /* Update the menu bar on X frames that don't have toolkit | |
3837 support. */ | |
3838 if (WINDOWP (f->menu_bar_window)) | |
3839 update_window (XWINDOW (f->menu_bar_window), 1); | |
3840 | |
3841 /* 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
|
3842 if (WINDOWP (f->tool_bar_window)) |
25012 | 3843 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3844 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 3845 |
3846 /* Update tool-bar window. */ | |
3847 if (w->must_be_updated_p) | |
3848 { | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3849 Lisp_Object tem; |
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
3850 |
25012 | 3851 update_window (w, 1); |
3852 w->must_be_updated_p = 0; | |
3853 | |
3854 /* Swap tool-bar strings. We swap because we want to | |
3855 reuse strings. */ | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3856 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
|
3857 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
|
3858 f->desired_tool_bar_string = tem; |
25012 | 3859 } |
3860 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3861 |
25012 | 3862 |
3863 /* Update windows. */ | |
3864 paused_p = update_window_tree (root_window, force_p); | |
3865 update_end (f); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3866 |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3867 /* This flush is a performance bottleneck under X, |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3868 and it doesn't seem to be necessary anyway (in general). |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3869 It is necessary when resizing the window with the mouse, or |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3870 at least the fringes are not redrawn in a timely manner. ++kfs */ |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3871 if (f->force_flush_display_p) |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3872 { |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3873 rif->flush_display (f); |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3874 f->force_flush_display_p = 0; |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3875 } |
25012 | 3876 } |
3877 else | |
3878 { | |
3879 /* We are working on frame matrix basis. Set the frame on whose | |
3880 frame matrix we operate. */ | |
3881 set_frame_matrix_frame (f); | |
3882 | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3883 /* Build F's desired matrix from window matrices. */ |
25012 | 3884 build_frame_matrix (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3885 |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3886 /* Update the display */ |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3887 update_begin (f); |
25012 | 3888 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
|
3889 update_end (f); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3890 |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3891 if (termscript) |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3892 fflush (termscript); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3893 fflush (stdout); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3894 |
25012 | 3895 /* 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
|
3896 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3897 check_window_matrix_pointers (root_window); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3898 add_frame_display_history (f, paused_p); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3899 #endif |
25012 | 3900 } |
3901 | |
3902 /* Reset flags indicating that a window should be updated. */ | |
3903 set_window_update_flags (root_window, 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3904 |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3905 display_completed = !paused_p; |
25012 | 3906 return paused_p; |
3907 } | |
3908 | |
3909 | |
3910 | |
3911 /************************************************************************ | |
3912 Window-based updates | |
3913 ************************************************************************/ | |
3914 | |
3915 /* Perform updates in window tree rooted at W. FORCE_P non-zero means | |
3916 don't stop updating when input is pending. */ | |
3917 | |
3918 static int | |
3919 update_window_tree (w, force_p) | |
3920 struct window *w; | |
3921 int force_p; | |
3922 { | |
3923 int paused_p = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3924 |
25012 | 3925 while (w && !paused_p) |
3926 { | |
3927 if (!NILP (w->hchild)) | |
3928 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p); | |
3929 else if (!NILP (w->vchild)) | |
3930 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p); | |
3931 else if (w->must_be_updated_p) | |
3932 paused_p |= update_window (w, force_p); | |
3933 | |
3934 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3935 } | |
3936 | |
3937 return paused_p; | |
3938 } | |
3939 | |
3940 | |
3941 /* Update window W if its flag must_be_updated_p is non-zero. If | |
3942 FORCE_P is non-zero, don't stop updating if input is pending. */ | |
3943 | |
3944 void | |
3945 update_single_window (w, force_p) | |
3946 struct window *w; | |
3947 int force_p; | |
3948 { | |
3949 if (w->must_be_updated_p) | |
3950 { | |
3951 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
3952 | |
3953 /* Record that this is not a frame-based redisplay. */ | |
3954 set_frame_matrix_frame (NULL); | |
3955 | |
3956 /* Update W. */ | |
3957 update_begin (f); | |
3958 update_window (w, force_p); | |
3959 update_end (f); | |
3960 | |
3961 /* Reset flag in W. */ | |
3962 w->must_be_updated_p = 0; | |
3963 } | |
3964 } | |
3965 | |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
3966 #ifdef HAVE_WINDOW_SYSTEM |
25012 | 3967 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3968 /* 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
|
3969 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
|
3970 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3971 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3972 redraw_overlapped_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3973 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3974 int yb; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3975 { |
30165
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
3976 int i; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3977 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3978 /* 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
|
3979 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
|
3980 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
|
3981 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
|
3982 current rows is 0. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3983 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
|
3984 { |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3985 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
|
3986 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3987 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3988 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3989 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3990 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3991 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3992 if (row->overlapped_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3993 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3994 enum glyph_row_area area; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3995 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3996 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
|
3997 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3998 updated_row = row; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3999 updated_area = area; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4000 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
|
4001 if (row->used[area]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4002 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
|
4003 rif->clear_end_of_line (-1); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4004 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4005 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4006 row->overlapped_p = 0; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4007 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4008 |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4009 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
|
4010 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4011 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4012 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4013 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4014 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4015 /* 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
|
4016 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
|
4017 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4018 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4019 redraw_overlapping_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4020 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4021 int yb; |
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 int i, bottom_y; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4024 struct glyph_row *row; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4025 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4026 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
|
4027 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4028 row = w->current_matrix->rows + i; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4029 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4030 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4031 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4032 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4033 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4034 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4035 bottom_y = MATRIX_ROW_BOTTOM_Y (row); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4036 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4037 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
|
4038 { |
65890
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4039 int overlaps = 0; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4040 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4041 if (MATRIX_ROW_OVERLAPS_PRED_P (row) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4042 && !MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4043 overlaps |= OVERLAPS_PRED; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4044 if (MATRIX_ROW_OVERLAPS_SUCC_P (row) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4045 && !MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4046 overlaps |= OVERLAPS_SUCC; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4047 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4048 if (overlaps) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4049 { |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4050 if (row->used[LEFT_MARGIN_AREA]) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4051 rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA, overlaps); |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4052 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4053 if (row->used[TEXT_AREA]) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4054 rif->fix_overlapping_area (w, row, TEXT_AREA, overlaps); |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4055 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4056 if (row->used[RIGHT_MARGIN_AREA]) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4057 rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps); |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4058 |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4059 /* Record in neighbour rows that ROW overwrites part of |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4060 their display. */ |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4061 if (overlaps & OVERLAPS_PRED) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4062 MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4063 if (overlaps & OVERLAPS_SUCC) |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4064 MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1; |
1a7a619caf97
(redraw_overlapping_rows): Call rif->fix_overlapping_area with new
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
65308
diff
changeset
|
4065 } |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4066 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4067 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4068 if (bottom_y >= yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4069 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4070 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4071 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4072 |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4073 #endif /* HAVE_WINDOW_SYSTEM */ |
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4074 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4075 |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4076 #ifdef GLYPH_DEBUG |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4077 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4078 /* 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
|
4079 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
|
4080 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4081 void |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4082 check_current_matrix_flags (w) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4083 struct window *w; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4084 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4085 int last_seen_p = 0; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4086 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
|
4087 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4088 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
|
4089 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4090 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
|
4091 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
|
4092 last_seen_p = 1; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4093 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
|
4094 abort (); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4095 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4096 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4097 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4098 #endif /* GLYPH_DEBUG */ |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4099 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4100 |
25012 | 4101 /* Update display of window W. FORCE_P non-zero means that we should |
4102 not stop when detecting pending input. */ | |
4103 | |
4104 static int | |
4105 update_window (w, force_p) | |
4106 struct window *w; | |
4107 int force_p; | |
4108 { | |
4109 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4110 int paused_p; | |
4111 int preempt_count = baud_rate / 2400 + 1; | |
4112 extern int input_pending; | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4113 extern Lisp_Object do_mouse_tracking; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4114 #if GLYPH_DEBUG |
25012 | 4115 /* Check that W's frame doesn't have glyph matrices. */ |
65308
7b2a711dc863
(window_to_frame_hpos, update_window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65016
diff
changeset
|
4116 xassert (FRAME_WINDOW_P (XFRAME (WINDOW_FRAME (w)))); |
25012 | 4117 xassert (updating_frame != NULL); |
59879
aaf00c303308
* dispnew.c (update_window): Fixing compile error due to
Steven Tamm <steventamm@mac.com>
parents:
59592
diff
changeset
|
4118 #endif |
25012 | 4119 |
4120 /* Check pending input the first time so that we can quickly return. */ | |
4121 if (redisplay_dont_pause) | |
4122 force_p = 1; | |
4123 else | |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
4124 detect_input_pending_ignore_squeezables (); |
25012 | 4125 |
4126 /* If forced to complete the update, or if no input is pending, do | |
4127 the update. */ | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4128 if (force_p || !input_pending || !NILP (do_mouse_tracking)) |
25012 | 4129 { |
4130 struct glyph_row *row, *end; | |
4131 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
|
4132 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
|
4133 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated; |
25012 | 4134 |
4135 rif->update_window_begin_hook (w); | |
4136 yb = window_text_bottom_y (w); | |
4137 | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4138 /* If window has a header line, update it before everything else. |
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4139 Adjust y-positions of other rows by the header line height. */ |
25012 | 4140 row = desired_matrix->rows; |
4141 end = row + desired_matrix->nrows - 1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4142 |
25012 | 4143 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
|
4144 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4145 header_line_row = row; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4146 ++row; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4147 } |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4148 else |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4149 header_line_row = NULL; |
25012 | 4150 |
4151 /* Update the mode line, if necessary. */ | |
4152 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix); | |
4153 if (mode_line_row->mode_line_p && mode_line_row->enabled_p) | |
4154 { | |
4155 mode_line_row->y = yb; | |
4156 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
|
4157 desired_matrix), |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4158 &mouse_face_overwritten_p); |
25012 | 4159 } |
4160 | |
4161 /* Find first enabled row. Optimizations in redisplay_internal | |
4162 may lead to an update with only one row enabled. There may | |
4163 be also completely empty matrices. */ | |
4164 while (row < end && !row->enabled_p) | |
4165 ++row; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4166 |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4167 /* Try reusing part of the display by copying. */ |
25012 | 4168 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
|
4169 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4170 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
|
4171 if (rc < 0) |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4172 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4173 /* 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
|
4174 paused_p = 0; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4175 goto set_cursor; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4176 } |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4177 else if (rc > 0) |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4178 { |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4179 /* We've scrolled the display. */ |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4180 force_p = 1; |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4181 changed_p = 1; |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
4182 } |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4183 } |
25012 | 4184 |
4185 /* 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
|
4186 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
|
4187 if (row->enabled_p) |
25012 | 4188 { |
4189 int vpos = MATRIX_ROW_VPOS (row, desired_matrix); | |
4190 int i; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4191 |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4192 /* We'll have to play a little bit with when to |
25012 | 4193 detect_input_pending. If it's done too often, |
4194 scrolling large windows with repeated scroll-up | |
4195 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
|
4196 if (!force_p && ++n_updated % preempt_count == 0) |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
4197 detect_input_pending_ignore_squeezables (); |
25012 | 4198 |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4199 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
|
4200 &mouse_face_overwritten_p); |
25012 | 4201 |
4202 /* Mark all rows below the last visible one in the current | |
4203 matrix as invalid. This is necessary because of | |
4204 variable line heights. Consider the case of three | |
4205 successive redisplays, where the first displays 5 | |
4206 lines, the second 3 lines, and the third 5 lines again. | |
4207 If the second redisplay wouldn't mark rows in the | |
4208 current matrix invalid, the third redisplay might be | |
4209 tempted to optimize redisplay based on lines displayed | |
4210 in the first redisplay. */ | |
4211 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
4212 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i) | |
4213 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
4214 } | |
4215 | |
4216 /* Was display preempted? */ | |
4217 paused_p = row < end; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4218 |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4219 set_cursor: |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4220 |
54176
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4221 /* Update the header line after scrolling because a new header |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4222 line would otherwise overwrite lines at the top of the window |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4223 that can be scrolled. */ |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4224 if (header_line_row && header_line_row->enabled_p) |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4225 { |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4226 header_line_row->y = 0; |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4227 update_window_line (w, 0, &mouse_face_overwritten_p); |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4228 } |
d1e478a807f4
(update_window): Update header line also if there are
Kim F. Storm <storm@cua.dk>
parents:
53881
diff
changeset
|
4229 |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4230 /* Fix the appearance of overlapping/overlapped rows. */ |
25012 | 4231 if (!paused_p && !w->pseudo_window_p) |
4232 { | |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4233 #ifdef HAVE_WINDOW_SYSTEM |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4234 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
|
4235 { |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4236 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
|
4237 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
|
4238 } |
65905
a82ae68a578e
(redraw_overlapped_rows, redraw_overlapping_rows)
Kim F. Storm <storm@cua.dk>
parents:
65890
diff
changeset
|
4239 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4240 |
25012 | 4241 /* Make cursor visible at cursor position of W. */ |
4242 set_window_cursor_after_update (w); | |
4243 | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4244 #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
|
4245 for debugging only. See the comment of check_matrix_invariants. */ |
25012 | 4246 IF_DEBUG (check_matrix_invariants (w)); |
4247 #endif | |
4248 } | |
4249 | |
4250 #if GLYPH_DEBUG | |
4251 /* Remember the redisplay method used to display the matrix. */ | |
4252 strcpy (w->current_matrix->method, w->desired_matrix->method); | |
4253 #endif | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4254 |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
4255 #ifdef HAVE_WINDOW_SYSTEM |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4256 update_window_fringes (w, 0); |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
4257 #endif |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4258 |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4259 /* 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
|
4260 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
|
4261 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
|
4262 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
|
4263 rif->update_window_end_hook (w, !paused_p, mouse_face_overwritten_p); |
25012 | 4264 } |
4265 else | |
4266 paused_p = 1; | |
4267 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
4268 #if GLYPH_DEBUG |
34944
4fc804373f2a
(update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents:
34929
diff
changeset
|
4269 /* check_current_matrix_flags (w); */ |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4270 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
|
4271 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4272 |
25012 | 4273 clear_glyph_matrix (desired_matrix); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4274 |
25012 | 4275 return paused_p; |
4276 } | |
4277 | |
4278 | |
4279 /* Update the display of area AREA in window W, row number VPOS. | |
4280 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */ | |
4281 | |
4282 static void | |
4283 update_marginal_area (w, area, vpos) | |
4284 struct window *w; | |
4285 int area, vpos; | |
4286 { | |
4287 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
4288 | |
4289 /* Let functions in xterm.c know what area subsequent X positions | |
4290 will be relative to. */ | |
4291 updated_area = area; | |
4292 | |
4293 /* Set cursor to start of glyphs, write them, and clear to the end | |
4294 of the area. I don't think that something more sophisticated is | |
4295 necessary here, since marginal areas will not be the default. */ | |
4296 rif->cursor_to (vpos, 0, desired_row->y, 0); | |
4297 if (desired_row->used[area]) | |
4298 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]); | |
4299 rif->clear_end_of_line (-1); | |
4300 } | |
4301 | |
4302 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4303 /* 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
|
4304 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
|
4305 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4306 static int |
25012 | 4307 update_text_area (w, vpos) |
4308 struct window *w; | |
4309 int vpos; | |
314 | 4310 { |
25012 | 4311 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); |
4312 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
|
4313 int changed_p = 0; |
25012 | 4314 |
4315 /* Let functions in xterm.c know what area subsequent X positions | |
4316 will be relative to. */ | |
4317 updated_area = TEXT_AREA; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4318 |
25012 | 4319 /* If rows are at different X or Y, or rows have different height, |
4320 or the current row is marked invalid, write the entire line. */ | |
4321 if (!current_row->enabled_p | |
4322 || desired_row->y != current_row->y | |
4323 || desired_row->ascent != current_row->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4324 || 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
|
4325 || desired_row->phys_height != current_row->phys_height |
25012 | 4326 || 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
|
4327 || current_row->overlapped_p |
30307
faf4e303bab7
(update_text_area): Write the whole row if it
Gerd Moellmann <gerd@gnu.org>
parents:
30165
diff
changeset
|
4328 || current_row->mouse_face_p |
25012 | 4329 || current_row->x != desired_row->x) |
4330 { | |
4331 rif->cursor_to (vpos, 0, desired_row->y, desired_row->x); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4332 |
25012 | 4333 if (desired_row->used[TEXT_AREA]) |
4334 rif->write_glyphs (desired_row->glyphs[TEXT_AREA], | |
4335 desired_row->used[TEXT_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4336 |
25012 | 4337 /* Clear to end of window. */ |
4338 rif->clear_end_of_line (-1); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4339 changed_p = 1; |
44815
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4340 |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4341 /* This erases the cursor. We do this here because |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4342 notice_overwritten_cursor cannot easily check this, which |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4343 might indicate that the whole functionality of |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4344 notice_overwritten_cursor would better be implemented here. |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4345 On the other hand, we need notice_overwritten_cursor as long |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4346 as mouse highlighting is done asynchronously outside of |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4347 redisplay. */ |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4348 if (vpos == w->phys_cursor.vpos) |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4349 w->phys_cursor_on_p = 0; |
25012 | 4350 } |
4351 else | |
4352 { | |
4353 int stop, i, x; | |
4354 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; | |
4355 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
|
4356 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
|
4357 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
|
4358 |
69110
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4359 /* If the desired row extends its face to the text area end, and |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4360 unless the current row also does so at the same position, |
25012 | 4361 make sure we write at least one glyph, so that the face |
4362 extension actually takes place. */ | |
69110
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4363 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row) |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4364 && (desired_stop_pos < current_row->used[TEXT_AREA] |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4365 || (desired_stop_pos == current_row->used[TEXT_AREA] |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4366 && !MATRIX_ROW_EXTENDS_FACE_P (current_row)))) |
35268
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4367 --desired_stop_pos; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4368 |
25012 | 4369 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); |
4370 i = 0; | |
4371 x = desired_row->x; | |
36097
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4372 |
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4373 /* 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
|
4374 in common. */ |
25012 | 4375 while (i < stop) |
4376 { | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4377 int can_skip_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4378 |
25012 | 4379 /* 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
|
4380 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
|
4381 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
|
4382 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
|
4383 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
|
4384 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
|
4385 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
|
4386 `f' on the screen. */ |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4387 if (overlapping_glyphs_p && i > 0) |
25012 | 4388 { |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4389 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
|
4390 int left, right; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4391 |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4392 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
|
4393 &left, &right); |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4394 can_skip_p = right == 0; |
25012 | 4395 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4396 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4397 if (can_skip_p) |
25012 | 4398 { |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4399 while (i < stop |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4400 && GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4401 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4402 x += desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4403 ++desired_glyph, ++current_glyph, ++i; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4404 } |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4405 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4406 /* 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
|
4407 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
|
4408 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
|
4409 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
|
4410 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
|
4411 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
|
4412 of the `p'. The rest of the lbearing problem is then |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
4413 taken care of by draw_glyphs. */ |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4414 if (overlapping_glyphs_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4415 && i > 0 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4416 && i < current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4417 && (current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4418 != desired_row->used[TEXT_AREA])) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4419 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4420 int left, right; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4421 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4422 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
|
4423 &left, &right); |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4424 while (left > 0 && i > 0) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4425 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4426 --i, --desired_glyph, --current_glyph; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4427 x -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4428 left -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4429 } |
25012 | 4430 } |
4431 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4432 |
25012 | 4433 /* Try to avoid writing the entire rest of the desired row |
4434 by looking for a resync point. This mainly prevents | |
4435 mode line flickering in the case the mode line is in | |
4436 fixed-pitch font, which it usually will be. */ | |
4437 if (i < desired_row->used[TEXT_AREA]) | |
4438 { | |
4439 int start_x = x, start_hpos = i; | |
4440 struct glyph *start = desired_glyph; | |
4441 int current_x = x; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4442 int skip_first_p = !can_skip_p; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4443 |
25012 | 4444 /* Find the next glyph that's equal again. */ |
4445 while (i < stop | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4446 && (skip_first_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4447 || !GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
25012 | 4448 && x == current_x) |
4449 { | |
4450 x += desired_glyph->pixel_width; | |
4451 current_x += current_glyph->pixel_width; | |
4452 ++desired_glyph, ++current_glyph, ++i; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4453 skip_first_p = 0; |
25012 | 4454 } |
4455 | |
4456 if (i == start_hpos || x != current_x) | |
4457 { | |
4458 i = start_hpos; | |
4459 x = start_x; | |
4460 desired_glyph = start; | |
4461 break; | |
4462 } | |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4463 |
25012 | 4464 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x); |
4465 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
|
4466 changed_p = 1; |
25012 | 4467 } |
4468 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4469 |
25012 | 4470 /* Write the rest. */ |
4471 if (i < desired_row->used[TEXT_AREA]) | |
4472 { | |
4473 rif->cursor_to (vpos, i, desired_row->y, x); | |
4474 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
|
4475 changed_p = 1; |
25012 | 4476 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4477 |
25012 | 4478 /* Maybe clear to end of line. */ |
4479 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) | |
4480 { | |
4481 /* If new row extends to the end of the text area, nothing | |
4482 has to be cleared, if and only if we did a write_glyphs | |
4483 above. This is made sure by setting desired_stop_pos | |
4484 appropriately above. */ | |
69110
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4485 xassert (i < desired_row->used[TEXT_AREA] |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4486 || ((desired_row->used[TEXT_AREA] |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4487 == current_row->used[TEXT_AREA]) |
9d86d35acf33
(update_text_area): Avoid needless redraw of rightmost
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
4488 && MATRIX_ROW_EXTENDS_FACE_P (current_row))); |
25012 | 4489 } |
4490 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) | |
4491 { | |
4492 /* If old row extends to the end of the text area, clear. */ | |
4493 if (i >= desired_row->used[TEXT_AREA]) | |
4494 rif->cursor_to (vpos, i, desired_row->y, | |
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4495 desired_row->pixel_width); |
25012 | 4496 rif->clear_end_of_line (-1); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4497 changed_p = 1; |
25012 | 4498 } |
4499 else if (desired_row->pixel_width < current_row->pixel_width) | |
4500 { | |
4501 /* Otherwise clear to the end of the old row. Everything | |
4502 after that position should be clear already. */ | |
4503 int x; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4504 |
25012 | 4505 if (i >= desired_row->used[TEXT_AREA]) |
4506 rif->cursor_to (vpos, i, desired_row->y, | |
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4507 desired_row->pixel_width); |
25012 | 4508 |
4509 /* If cursor is displayed at the end of the line, make sure | |
4510 it's cleared. Nowadays we don't have a phys_cursor_glyph | |
4511 with which to erase the cursor (because this method | |
4512 doesn't work with lbearing/rbearing), so we must do it | |
4513 this way. */ | |
4514 if (vpos == w->phys_cursor.vpos | |
4515 && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA]) | |
4516 { | |
4517 w->phys_cursor_on_p = 0; | |
4518 x = -1; | |
4519 } | |
4520 else | |
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4521 x = current_row->pixel_width; |
25012 | 4522 rif->clear_end_of_line (x); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4523 changed_p = 1; |
25012 | 4524 } |
4525 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4526 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4527 return changed_p; |
25012 | 4528 } |
4529 | |
4530 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4531 /* 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
|
4532 changed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4533 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4534 static int |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4535 update_window_line (w, vpos, mouse_face_overwritten_p) |
25012 | 4536 struct window *w; |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4537 int vpos, *mouse_face_overwritten_p; |
25012 | 4538 { |
4539 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); | |
4540 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
|
4541 int changed_p = 0; |
25012 | 4542 |
4543 /* Set the row being updated. This is important to let xterm.c | |
4544 know what line height values are in effect. */ | |
4545 updated_row = desired_row; | |
4546 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4547 /* A row can be completely invisible in case a desired matrix was |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4548 built with a vscroll and then make_cursor_line_fully_visible shifts |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4549 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
|
4550 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
|
4551 if (desired_row->mode_line_p |
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4552 || desired_row->visible_height > 0) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4553 { |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4554 xassert (desired_row->enabled_p); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4555 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4556 /* 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
|
4557 if (!desired_row->full_width_p |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4558 && !NILP (w->left_margin_cols)) |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4559 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4560 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4561 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
|
4562 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4563 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4564 /* Update the display of the text area. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4565 if (update_text_area (w, vpos)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4566 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4567 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4568 if (current_row->mouse_face_p) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4569 *mouse_face_overwritten_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4570 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4571 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4572 /* 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
|
4573 if (!desired_row->full_width_p |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
4574 && !NILP (w->right_margin_cols)) |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4575 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4576 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4577 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
|
4578 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4579 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4580 /* Draw truncation marks etc. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4581 if (!current_row->enabled_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4582 || desired_row->y != current_row->y |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4583 || desired_row->visible_height != current_row->visible_height |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4584 || desired_row->cursor_in_fringe_p != current_row->cursor_in_fringe_p |
61633
a76a30ee7c89
(row_equal_p, update_window_line, scrolling_window):
Kim F. Storm <storm@cua.dk>
parents:
61416
diff
changeset
|
4585 || desired_row->overlay_arrow_bitmap != current_row->overlay_arrow_bitmap |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4586 || current_row->redraw_fringe_bitmaps_p |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4587 || desired_row->mode_line_p != current_row->mode_line_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4588 || desired_row->exact_window_width_line_p != current_row->exact_window_width_line_p |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4589 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4590 != MATRIX_ROW_CONTINUATION_LINE_P (current_row))) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4591 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
|
4592 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4593 |
25012 | 4594 /* Update current_row from desired_row. */ |
4595 make_current (w->desired_matrix, w->current_matrix, vpos); | |
4596 updated_row = NULL; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4597 return changed_p; |
25012 | 4598 } |
4599 | |
4600 | |
4601 /* Set the cursor after an update of window W. This function may only | |
4602 be called from update_window. */ | |
4603 | |
4604 static void | |
4605 set_window_cursor_after_update (w) | |
4606 struct window *w; | |
4607 { | |
4608 struct frame *f = XFRAME (w->frame); | |
4609 int cx, cy, vpos, hpos; | |
4610 | |
4611 /* Not intended for frame matrix updates. */ | |
4612 xassert (FRAME_WINDOW_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4613 |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4614 if (cursor_in_echo_area |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4615 && !NILP (echo_area_buffer[0]) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4616 /* 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
|
4617 show the cursor for the message instead. */ |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4618 && XWINDOW (minibuf_window) == w |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4619 && EQ (minibuf_window, echo_area_window) |
25012 | 4620 /* These cases apply only to the frame that contains |
4621 the active mini-buffer window. */ | |
4622 && FRAME_HAS_MINIBUF_P (f) | |
4623 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) | |
4624 { | |
4625 cx = cy = vpos = hpos = 0; | |
4626 | |
4627 if (cursor_in_echo_area >= 0) | |
4628 { | |
4629 /* If the mini-buffer is several lines high, find the last | |
4630 line that has any text on it. Note: either all lines | |
4631 are enabled or none. Otherwise we wouldn't be able to | |
4632 determine Y. */ | |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4633 struct glyph_row *row, *last_row; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4634 struct glyph *glyph; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4635 int yb = window_text_bottom_y (w); |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4636 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4637 last_row = NULL; |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4638 row = w->current_matrix->rows; |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4639 while (row->enabled_p |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4640 && (last_row == NULL |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4641 || MATRIX_ROW_BOTTOM_Y (row) <= yb)) |
25012 | 4642 { |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4643 if (row->used[TEXT_AREA] |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4644 && row->glyphs[TEXT_AREA][0].charpos >= 0) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4645 last_row = row; |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4646 ++row; |
25012 | 4647 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4648 |
25012 | 4649 if (last_row) |
4650 { | |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4651 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
|
4652 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
|
4653 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4654 while (last > start && last->charpos < 0) |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4655 --last; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4656 |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4657 for (glyph = start; glyph < last; ++glyph) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4658 { |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4659 cx += glyph->pixel_width; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4660 ++hpos; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4661 } |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4662 |
25012 | 4663 cy = last_row->y; |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4664 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix); |
25012 | 4665 } |
4666 } | |
4667 } | |
4668 else | |
4669 { | |
4670 cx = w->cursor.x; | |
4671 cy = w->cursor.y; | |
4672 hpos = w->cursor.hpos; | |
4673 vpos = w->cursor.vpos; | |
4674 } | |
4675 | |
4676 /* Window cursor can be out of sync for horizontally split windows. */ | |
4677 hpos = max (0, hpos); | |
4678 hpos = min (w->current_matrix->matrix_w - 1, hpos); | |
4679 vpos = max (0, vpos); | |
4680 vpos = min (w->current_matrix->nrows - 1, vpos); | |
4681 rif->cursor_to (vpos, hpos, cy, cx); | |
4682 } | |
4683 | |
4684 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4685 /* 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
|
4686 tree rooted at W. */ |
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 void |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4689 set_window_update_flags (w, on_p) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4690 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4691 int on_p; |
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 while (w) |
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 if (!NILP (w->hchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4696 set_window_update_flags (XWINDOW (w->hchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4697 else if (!NILP (w->vchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4698 set_window_update_flags (XWINDOW (w->vchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4699 else |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4700 w->must_be_updated_p = on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4701 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4702 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4703 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4704 } |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4705 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4706 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4707 |
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 Window-Based Scrolling |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4710 ***********************************************************************/ |
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 /* Structure describing rows in scrolling_window. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4713 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4714 struct row_entry |
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 /* 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
|
4717 int old_uses, new_uses; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4718 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4719 /* Vpos of row in new matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4720 int new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4721 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4722 /* 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
|
4723 int bucket; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4724 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4725 /* The row described by this entry. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4726 struct glyph_row *row; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4727 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4728 /* Hash collision chain. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4729 struct row_entry *next; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4730 }; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4731 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4732 /* 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
|
4733 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
|
4734 that we need a larger one. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4735 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4736 static struct row_entry *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4737 static int row_entry_pool_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4738 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4739 /* Index of next free entry in row_entry_pool. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4740 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4741 static int row_entry_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4742 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4743 /* 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
|
4744 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
|
4745 current matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4746 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4747 static struct row_entry **row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4748 static int row_table_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4749 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4750 /* 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
|
4751 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
|
4752 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4753 static struct row_entry **old_lines, **new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4754 static int old_lines_size, new_lines_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4755 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4756 /* 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
|
4757 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4758 static struct run *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4759 static int runs_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4760 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4761 /* A vector of runs of lines found during scrolling. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4762 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4763 static struct run **runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4764 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4765 /* 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
|
4766 of window W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4767 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4768 static INLINE struct row_entry * |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4769 add_row_entry (w, row) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4770 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4771 struct glyph_row *row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4772 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4773 struct row_entry *entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4774 int i = row->hash % row_table_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4775 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4776 entry = row_table[i]; |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
4777 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
|
4778 entry = entry->next; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4779 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4780 if (entry == NULL) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4781 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4782 entry = row_entry_pool + row_entry_idx++; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4783 entry->row = row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4784 entry->old_uses = entry->new_uses = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4785 entry->new_line_number = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4786 entry->bucket = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4787 entry->next = row_table[i]; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4788 row_table[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4789 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4790 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4791 return entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4792 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4793 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4794 |
25012 | 4795 /* Try to reuse part of the current display of W by scrolling lines. |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
4796 HEADER_LINE_P non-zero means W has a header line. |
25012 | 4797 |
4798 The algorithm is taken from Communications of the ACM, Apr78 "A | |
4799 Technique for Isolating Differences Between Files." It should take | |
4800 O(N) time. | |
4801 | |
4802 A short outline of the steps of the algorithm | |
4803 | |
4804 1. Skip lines equal at the start and end of both matrices. | |
4805 | |
4806 2. Enter rows in the current and desired matrix into a symbol | |
4807 table, counting how often they appear in both matrices. | |
4808 | |
4809 3. Rows that appear exactly once in both matrices serve as anchors, | |
4810 i.e. we assume that such lines are likely to have been moved. | |
4811 | |
4812 4. Starting from anchor lines, extend regions to be scrolled both | |
4813 forward and backward. | |
4814 | |
4815 Value is | |
4816 | |
4817 -1 if all rows were found to be equal. | |
4818 0 to indicate that we did not scroll the display, or | |
4819 1 if we did scroll. */ | |
4820 | |
4821 static int | |
25546 | 4822 scrolling_window (w, header_line_p) |
25012 | 4823 struct window *w; |
25546 | 4824 int header_line_p; |
25012 | 4825 { |
4826 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4827 struct glyph_matrix *current_matrix = w->current_matrix; | |
4828 int yb = window_text_bottom_y (w); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4829 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
|
4830 int nruns, nbytes, n, run_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4831 struct row_entry *entry; |
25012 | 4832 |
4833 /* 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
|
4834 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i) |
25012 | 4835 { |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4836 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
|
4837 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
|
4838 |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4839 if (c->enabled_p |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4840 && d->enabled_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4841 && !d->redraw_fringe_bitmaps_p |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4842 && c->y == d->y |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4843 && MATRIX_ROW_BOTTOM_Y (c) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4844 && MATRIX_ROW_BOTTOM_Y (d) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4845 && row_equal_p (w, c, d, 1)) |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4846 { |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4847 assign_row (c, d); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4848 d->enabled_p = 0; |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4849 } |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4850 else |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4851 break; |
25012 | 4852 } |
4853 | |
4854 /* Give up if some rows in the desired matrix are not enabled. */ | |
4855 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4856 return -1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4857 |
25012 | 4858 first_old = first_new = i; |
4859 | |
4860 /* Set last_new to the index + 1 of the last enabled row in the | |
4861 desired matrix. */ | |
4862 i = first_new + 1; | |
4863 while (i < desired_matrix->nrows - 1 | |
4864 && MATRIX_ROW (desired_matrix, i)->enabled_p | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4865 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb) |
25012 | 4866 ++i; |
4867 | |
4868 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4869 return 0; | |
4870 | |
4871 last_new = i; | |
4872 | |
4873 /* Set last_old to the index + 1 of the last enabled row in the | |
4874 current matrix. We don't look at the enabled flag here because | |
4875 we plan to reuse part of the display even if other parts are | |
4876 disabled. */ | |
4877 i = first_old + 1; | |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4878 while (i < current_matrix->nrows - 1) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4879 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4880 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
|
4881 if (bottom <= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4882 ++i; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4883 if (bottom >= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4884 break; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4885 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4886 |
25012 | 4887 last_old = i; |
4888 | |
4889 /* Skip over rows equal at the bottom. */ | |
4890 i = last_new; | |
4891 j = last_old; | |
4892 while (i - 1 > first_new | |
4893 && j - 1 > first_old | |
4894 && MATRIX_ROW (current_matrix, i - 1)->enabled_p | |
4895 && (MATRIX_ROW (current_matrix, i - 1)->y | |
4896 == MATRIX_ROW (desired_matrix, j - 1)->y) | |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4897 && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p |
25012 | 4898 && row_equal_p (w, |
4899 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
|
4900 MATRIX_ROW (current_matrix, j - 1), 1)) |
25012 | 4901 --i, --j; |
4902 last_new = i; | |
4903 last_old = j; | |
4904 | |
4905 /* Nothing to do if all rows are equal. */ | |
4906 if (last_new == first_new) | |
4907 return 0; | |
4908 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4909 /* Reallocate vectors, tables etc. if necessary. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4910 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4911 if (current_matrix->nrows > old_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4912 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4913 old_lines_size = current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4914 nbytes = old_lines_size * sizeof *old_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4915 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4916 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4917 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4918 if (desired_matrix->nrows > new_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4919 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4920 new_lines_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4921 nbytes = new_lines_size * sizeof *new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4922 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4923 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4924 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4925 n = desired_matrix->nrows + current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4926 if (3 * n > row_table_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4927 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4928 row_table_size = next_almost_prime (3 * n); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4929 nbytes = row_table_size * sizeof *row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4930 row_table = (struct row_entry **) xrealloc (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4931 bzero (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4932 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4933 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4934 if (n > row_entry_pool_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4935 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4936 row_entry_pool_size = n; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4937 nbytes = row_entry_pool_size * sizeof *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4938 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
|
4939 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4940 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4941 if (desired_matrix->nrows > runs_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4942 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4943 runs_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4944 nbytes = runs_size * sizeof *runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4945 runs = (struct run **) xrealloc (runs, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4946 nbytes = runs_size * sizeof *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4947 run_pool = (struct run *) xrealloc (run_pool, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4948 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4949 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4950 nruns = run_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4951 row_entry_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4952 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4953 /* 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
|
4954 row_hash_table to be able to find equal ones quickly. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4955 |
25012 | 4956 for (i = first_old; i < last_old; ++i) |
4957 { | |
4958 if (MATRIX_ROW (current_matrix, i)->enabled_p) | |
4959 { | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4960 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
|
4961 old_lines[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4962 ++entry->old_uses; |
25012 | 4963 } |
4964 else | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4965 old_lines[i] = NULL; |
25012 | 4966 } |
4967 | |
4968 for (i = first_new; i < last_new; ++i) | |
4969 { | |
4970 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i)); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4971 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
|
4972 ++entry->new_uses; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4973 entry->new_line_number = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4974 new_lines[i] = entry; |
25012 | 4975 } |
4976 | |
4977 /* Identify moves based on lines that are unique and equal | |
4978 in both matrices. */ | |
4979 for (i = first_old; i < last_old;) | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4980 if (old_lines[i] |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4981 && old_lines[i]->old_uses == 1 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4982 && old_lines[i]->new_uses == 1) |
25012 | 4983 { |
4984 int j, k; | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4985 int new_line = old_lines[i]->new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4986 struct run *run = run_pool + run_idx++; |
25012 | 4987 |
4988 /* Record move. */ | |
4989 run->current_vpos = i; | |
4990 run->current_y = MATRIX_ROW (current_matrix, i)->y; | |
4991 run->desired_vpos = new_line; | |
4992 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y; | |
4993 run->nrows = 1; | |
4994 run->height = MATRIX_ROW (current_matrix, i)->height; | |
4995 | |
4996 /* Extend backward. */ | |
4997 j = i - 1; | |
4998 k = new_line - 1; | |
4999 while (j > first_old | |
5000 && k > first_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5001 && old_lines[j] == new_lines[k]) |
25012 | 5002 { |
5003 int h = MATRIX_ROW (current_matrix, j)->height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5004 --run->current_vpos; |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5005 --run->desired_vpos; |
25012 | 5006 ++run->nrows; |
5007 run->height += h; | |
5008 run->desired_y -= h; | |
5009 run->current_y -= h; | |
5010 --j, --k; | |
5011 } | |
5012 | |
5013 /* Extend forward. */ | |
5014 j = i + 1; | |
5015 k = new_line + 1; | |
5016 while (j < last_old | |
5017 && k < last_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5018 && old_lines[j] == new_lines[k]) |
25012 | 5019 { |
5020 int h = MATRIX_ROW (current_matrix, j)->height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5021 ++run->nrows; |
25012 | 5022 run->height += h; |
5023 ++j, ++k; | |
5024 } | |
5025 | |
5026 /* Insert run into list of all runs. Order runs by copied | |
5027 pixel lines. Note that we record runs that don't have to | |
5028 be copied because they are already in place. This is done | |
5029 because we can avoid calling update_window_line in this | |
5030 case. */ | |
5031 for (j = 0; j < nruns && runs[j]->height > run->height; ++j) | |
5032 ; | |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
5033 for (k = nruns; k > j; --k) |
25012 | 5034 runs[k] = runs[k - 1]; |
5035 runs[j] = run; | |
5036 ++nruns; | |
5037 | |
5038 i += run->nrows; | |
5039 } | |
5040 else | |
5041 ++i; | |
5042 | |
5043 /* Do the moves. Do it in a way that we don't overwrite something | |
5044 we want to copy later on. This is not solvable in general | |
5045 because there is only one display and we don't have a way to | |
5046 exchange areas on this display. Example: | |
5047 | |
5048 +-----------+ +-----------+ | |
5049 | A | | B | | |
5050 +-----------+ --> +-----------+ | |
5051 | B | | A | | |
5052 +-----------+ +-----------+ | |
5053 | |
5054 Instead, prefer bigger moves, and invalidate moves that would | |
5055 copy from where we copied to. */ | |
5056 | |
5057 for (i = 0; i < nruns; ++i) | |
5058 if (runs[i]->nrows > 0) | |
5059 { | |
5060 struct run *r = runs[i]; | |
5061 | |
5062 /* Copy on the display. */ | |
5063 if (r->current_y != r->desired_y) | |
5064 { | |
5065 rif->scroll_run_hook (w, r); | |
5066 | |
5067 /* Invalidate runs that copy from where we copied to. */ | |
5068 for (j = i + 1; j < nruns; ++j) | |
5069 { | |
5070 struct run *p = runs[j]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5071 |
25012 | 5072 if ((p->current_y >= r->desired_y |
5073 && p->current_y < r->desired_y + r->height) | |
5074 || (p->current_y + p->height >= r->desired_y | |
5075 && (p->current_y + p->height | |
5076 < r->desired_y + r->height))) | |
5077 p->nrows = 0; | |
5078 } | |
5079 } | |
5080 | |
5081 /* Assign matrix rows. */ | |
5082 for (j = 0; j < r->nrows; ++j) | |
5083 { | |
5084 struct glyph_row *from, *to; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
5085 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
|
5086 |
25012 | 5087 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
|
5088 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
|
5089 to_overlapped_p = to->overlapped_p; |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
5090 if (!from->mode_line_p && !w->pseudo_window_p |
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
5091 && (to->left_fringe_bitmap != from->left_fringe_bitmap |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
5092 || to->right_fringe_bitmap != from->right_fringe_bitmap |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
5093 || to->left_fringe_face_id != from->left_fringe_face_id |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
5094 || to->right_fringe_face_id != from->right_fringe_face_id |
61633
a76a30ee7c89
(row_equal_p, update_window_line, scrolling_window):
Kim F. Storm <storm@cua.dk>
parents:
61416
diff
changeset
|
5095 || to->overlay_arrow_bitmap != from->overlay_arrow_bitmap)) |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
5096 from->redraw_fringe_bitmaps_p = 1; |
25012 | 5097 assign_row (to, from); |
5098 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
|
5099 to->overlapped_p = to_overlapped_p; |
25012 | 5100 } |
5101 } | |
5102 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5103 /* Clear the hash table, for the next time. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5104 for (i = 0; i < row_entry_idx; ++i) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5105 row_table[row_entry_pool[i].bucket] = NULL; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5106 |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
5107 /* Value is > 0 to indicate that we scrolled the display. */ |
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
5108 return nruns; |
25012 | 5109 } |
5110 | |
5111 | |
5112 | |
5113 /************************************************************************ | |
5114 Frame-Based Updates | |
5115 ************************************************************************/ | |
5116 | |
5117 /* Update the desired frame matrix of frame F. | |
5118 | |
5119 FORCE_P non-zero means that the update should not be stopped by | |
5120 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling | |
5121 should not be tried. | |
5122 | |
5123 Value is non-zero if update was stopped due to pending input. */ | |
5124 | |
5125 static int | |
5126 update_frame_1 (f, force_p, inhibit_id_p) | |
5127 struct frame *f; | |
5128 int force_p; | |
5129 int inhibit_id_p; | |
5130 { | |
5131 /* Frame matrices to work on. */ | |
5132 struct glyph_matrix *current_matrix = f->current_matrix; | |
5133 struct glyph_matrix *desired_matrix = f->desired_matrix; | |
5134 int i; | |
314 | 5135 int pause; |
5136 int preempt_count = baud_rate / 2400 + 1; | |
21514 | 5137 extern int input_pending; |
25012 | 5138 |
5139 xassert (current_matrix && desired_matrix); | |
314 | 5140 |
10122
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5141 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
|
5142 calculate_costs (f); |
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5143 |
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5144 if (preempt_count <= 0) |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5145 preempt_count = 1; |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5146 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5147 if (redisplay_dont_pause) |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5148 force_p = 1; |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
5149 else if (!force_p && detect_input_pending_ignore_squeezables ()) |
314 | 5150 { |
5151 pause = 1; | |
5152 goto do_pause; | |
5153 } | |
5154 | |
25012 | 5155 /* If we cannot insert/delete lines, it's no use trying it. */ |
314 | 5156 if (!line_ins_del_ok) |
25012 | 5157 inhibit_id_p = 1; |
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
5158 |
493 | 5159 /* See if any of the desired lines are enabled; don't compute for |
25012 | 5160 i/d line if just want cursor motion. */ |
5161 for (i = 0; i < desired_matrix->nrows; i++) | |
5162 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
314 | 5163 break; |
5164 | |
5165 /* Try doing i/d line, if not yet inhibited. */ | |
25012 | 5166 if (!inhibit_id_p && i < desired_matrix->nrows) |
5167 force_p |= scrolling (f); | |
314 | 5168 |
5169 /* Update the individual lines as needed. Do bottom line first. */ | |
25012 | 5170 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1)) |
5171 update_frame_line (f, desired_matrix->nrows - 1); | |
5172 | |
5173 /* Now update the rest of the lines. */ | |
5174 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++) | |
314 | 5175 { |
25012 | 5176 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) |
314 | 5177 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5178 if (FRAME_TERMCAP_P (f)) |
314 | 5179 { |
5180 /* Flush out every so many lines. | |
5181 Also flush out if likely to have more than 1k buffered | |
5182 otherwise. I'm told that some telnet connections get | |
5183 really screwed by more than 1k output at once. */ | |
5184 int outq = PENDING_OUTPUT_COUNT (stdout); | |
5185 if (outq > 900 | |
5186 || (outq > 20 && ((i - 1) % preempt_count == 0))) | |
5187 { | |
5188 fflush (stdout); | |
5189 if (preempt_count == 1) | |
5190 { | |
554 | 5191 #ifdef EMACS_OUTQSIZE |
5192 if (EMACS_OUTQSIZE (0, &outq) < 0) | |
314 | 5193 /* Probably not a tty. Ignore the error and reset |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
5194 the outq count. */ |
314 | 5195 outq = PENDING_OUTPUT_COUNT (stdout); |
5196 #endif | |
5197 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
|
5198 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
|
5199 sleep (outq / baud_rate); |
314 | 5200 } |
5201 } | |
5202 } | |
5203 | |
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5204 if ((i - 1) % preempt_count == 0) |
59580
f43d0816e9c3
* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
Jan Djärv <jan.h.d@swipnet.se>
parents:
58986
diff
changeset
|
5205 detect_input_pending_ignore_squeezables (); |
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5206 |
25012 | 5207 update_frame_line (f, i); |
314 | 5208 } |
5209 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5210 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5211 pause = (i < FRAME_LINES (f) - 1) ? i : 0; |
314 | 5212 |
5213 /* Now just clean up termcap drivers and set cursor, etc. */ | |
5214 if (!pause) | |
5215 { | |
12409
6e374b28ecc3
(update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents:
12193
diff
changeset
|
5216 if ((cursor_in_echo_area |
25012 | 5217 /* 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
|
5218 show the cursor for the message instead of for the |
25012 | 5219 (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
|
5220 || (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
|
5221 && EQ (minibuf_window, echo_area_window) |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5222 && !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
|
5223 /* These cases apply only to the frame that contains |
25012 | 5224 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
|
5225 && FRAME_HAS_MINIBUF_P (f) |
14459
c1d25453a95f
(update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents:
14286
diff
changeset
|
5226 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) |
708 | 5227 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5228 int top = WINDOW_TOP_EDGE_LINE (XWINDOW (FRAME_MINIBUF_WINDOW (f))); |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5229 int row, col; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5230 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5231 if (cursor_in_echo_area < 0) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5232 { |
25012 | 5233 /* Negative value of cursor_in_echo_area means put |
5234 cursor at beginning of line. */ | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5235 row = top; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5236 col = 0; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5237 } |
708 | 5238 else |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5239 { |
25012 | 5240 /* Positive value of cursor_in_echo_area means put |
5241 cursor at the end of the prompt. If the mini-buffer | |
5242 is several lines high, find the last line that has | |
5243 any text on it. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5244 row = FRAME_LINES (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5245 do |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5246 { |
25012 | 5247 --row; |
5248 col = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5249 |
25012 | 5250 if (MATRIX_ROW_ENABLED_P (current_matrix, row)) |
5251 { | |
5252 /* Frame rows are filled up with spaces that | |
5253 must be ignored here. */ | |
5254 struct glyph_row *r = MATRIX_ROW (current_matrix, | |
5255 row); | |
5256 struct glyph *start = r->glyphs[TEXT_AREA]; | |
5257 struct glyph *last = start + r->used[TEXT_AREA]; | |
5258 | |
5259 while (last > start | |
5260 && (last - 1)->charpos < 0) | |
5261 --last; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5262 |
25012 | 5263 col = last - start; |
5264 } | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5265 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5266 while (row > top && col == 0); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5267 |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5268 /* 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
|
5269 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
|
5270 { |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5271 /* If we have another row, advance cursor into it. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5272 if (row < FRAME_LINES (f) - 1) |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5273 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5274 col = FRAME_LEFT_SCROLL_BAR_COLS (f); |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5275 row++; |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5276 } |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5277 /* 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
|
5278 else |
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
5279 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
|
5280 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5281 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5282 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5283 cursor_to (row, col); |
708 | 5284 } |
314 | 5285 else |
25012 | 5286 { |
5287 /* We have only one cursor on terminal frames. Use it to | |
5288 display the cursor of the selected window. */ | |
5289 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
|
5290 if (w->cursor.vpos >= 0 |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5291 /* 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
|
5292 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
|
5293 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
|
5294 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
|
5295 a new cursor position has been computed. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5296 && w->cursor.vpos < WINDOW_TOTAL_LINES (w)) |
25012 | 5297 { |
5298 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); | |
5299 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
5300 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5301 if (INTEGERP (w->left_margin_cols)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5302 x += XFASTINT (w->left_margin_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5303 |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5304 /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */ |
25012 | 5305 cursor_to (y, x); |
5306 } | |
5307 } | |
314 | 5308 } |
5309 | |
5310 do_pause: | |
5311 | |
25012 | 5312 clear_desired_matrices (f); |
314 | 5313 return pause; |
5314 } | |
5315 | |
25012 | 5316 |
5317 /* Do line insertions/deletions on frame F for frame-based redisplay. */ | |
314 | 5318 |
21514 | 5319 int |
764 | 5320 scrolling (frame) |
25012 | 5321 struct frame *frame; |
314 | 5322 { |
5323 int unchanged_at_top, unchanged_at_bottom; | |
5324 int window_size; | |
5325 int changed_lines; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5326 int *old_hash = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5327 int *new_hash = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5328 int *draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5329 int *old_draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
314 | 5330 register int i; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5331 int free_at_end_vpos = FRAME_LINES (frame); |
25012 | 5332 struct glyph_matrix *current_matrix = frame->current_matrix; |
5333 struct glyph_matrix *desired_matrix = frame->desired_matrix; | |
5334 | |
5335 if (!current_matrix) | |
5336 abort (); | |
5337 | |
5338 /* Compute hash codes of all the lines. Also calculate number of | |
5339 changed lines, number of unchanged lines at the beginning, and | |
5340 number of unchanged lines at the end. */ | |
314 | 5341 changed_lines = 0; |
5342 unchanged_at_top = 0; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5343 unchanged_at_bottom = FRAME_LINES (frame); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5344 for (i = 0; i < FRAME_LINES (frame); i++) |
314 | 5345 { |
5346 /* Give up on this scrolling if some old lines are not enabled. */ | |
25012 | 5347 if (!MATRIX_ROW_ENABLED_P (current_matrix, i)) |
314 | 5348 return 0; |
25012 | 5349 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i)); |
5350 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
|
5351 { |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5352 /* 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
|
5353 new_hash[i] = old_hash[i]; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5354 #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
|
5355 draw_cost[i] = INFINITY; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5356 } |
314 | 5357 else |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5358 { |
25012 | 5359 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i)); |
5360 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
|
5361 } |
314 | 5362 |
5363 if (old_hash[i] != new_hash[i]) | |
5364 { | |
5365 changed_lines++; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5366 unchanged_at_bottom = FRAME_LINES (frame) - i - 1; |
314 | 5367 } |
5368 else if (i == unchanged_at_top) | |
5369 unchanged_at_top++; | |
25012 | 5370 old_draw_cost[i] = line_draw_cost (current_matrix, i); |
314 | 5371 } |
5372 | |
5373 /* If changed lines are few, don't allow preemption, don't scroll. */ | |
25012 | 5374 if ((!scroll_region_ok && changed_lines < baud_rate / 2400) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5375 || unchanged_at_bottom == FRAME_LINES (frame)) |
314 | 5376 return 1; |
5377 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5378 window_size = (FRAME_LINES (frame) - unchanged_at_top |
314 | 5379 - unchanged_at_bottom); |
5380 | |
5381 if (scroll_region_ok) | |
5382 free_at_end_vpos -= unchanged_at_bottom; | |
764 | 5383 else if (memory_below_frame) |
314 | 5384 free_at_end_vpos = -1; |
5385 | |
5386 /* If large window, fast terminal and few lines in common between | |
25012 | 5387 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
|
5388 if (!scroll_region_ok && window_size >= 18 && baud_rate > 2400 |
314 | 5389 && (window_size >= |
5390 10 * scrolling_max_lines_saved (unchanged_at_top, | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5391 FRAME_LINES (frame) - unchanged_at_bottom, |
314 | 5392 old_hash, new_hash, draw_cost))) |
5393 return 0; | |
5394 | |
25012 | 5395 if (window_size < 2) |
5396 return 0; | |
5397 | |
764 | 5398 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, |
314 | 5399 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
|
5400 old_draw_cost + unchanged_at_top - 1, |
314 | 5401 old_hash + unchanged_at_top - 1, |
5402 new_hash + unchanged_at_top - 1, | |
5403 free_at_end_vpos - unchanged_at_top); | |
5404 | |
5405 return 0; | |
5406 } | |
25012 | 5407 |
5408 | |
5409 /* Count the number of blanks at the start of the vector of glyphs R | |
5410 which is LEN glyphs long. */ | |
5411 | |
5412 static int | |
5413 count_blanks (r, len) | |
5414 struct glyph *r; | |
5415 int len; | |
314 | 5416 { |
25012 | 5417 int i; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5418 |
25012 | 5419 for (i = 0; i < len; ++i) |
5420 if (!CHAR_GLYPH_SPACE_P (r[i])) | |
5421 break; | |
5422 | |
5423 return i; | |
314 | 5424 } |
25012 | 5425 |
5426 | |
5427 /* Count the number of glyphs in common at the start of the glyph | |
5428 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end | |
5429 of STR2. Value is the number of equal glyphs equal at the start. */ | |
314 | 5430 |
5431 static int | |
25012 | 5432 count_match (str1, end1, str2, end2) |
5433 struct glyph *str1, *end1, *str2, *end2; | |
314 | 5434 { |
25012 | 5435 struct glyph *p1 = str1; |
5436 struct glyph *p2 = str2; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5437 |
25012 | 5438 while (p1 < end1 |
5439 && p2 < end2 | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
5440 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2)) |
25012 | 5441 ++p1, ++p2; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5442 |
25012 | 5443 return p1 - str1; |
314 | 5444 } |
5445 | |
25012 | 5446 |
314 | 5447 /* Char insertion/deletion cost vector, from term.c */ |
25012 | 5448 |
314 | 5449 extern int *char_ins_del_vector; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5450 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))]) |
314 | 5451 |
25012 | 5452 |
5453 /* Perform a frame-based update on line VPOS in frame FRAME. */ | |
5454 | |
314 | 5455 static void |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5456 update_frame_line (f, vpos) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5457 struct frame *f; |
314 | 5458 int vpos; |
5459 { | |
25012 | 5460 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend; |
314 | 5461 int tem; |
5462 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
|
5463 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
|
5464 struct glyph_matrix *desired_matrix = f->desired_matrix; |
25012 | 5465 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos); |
5466 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos); | |
5467 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
|
5468 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
|
5469 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
|
5470 != FACE_TTY_DEFAULT_BG_COLOR); |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5471 |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5472 if (colored_spaces_p) |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5473 write_spaces_p = 1; |
25012 | 5474 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5475 /* 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
|
5476 write the whole desired line in that case. */ |
25012 | 5477 must_write_whole_line_p = !current_row->enabled_p; |
5478 if (must_write_whole_line_p) | |
314 | 5479 { |
25012 | 5480 obody = 0; |
314 | 5481 olen = 0; |
5482 } | |
5483 else | |
5484 { | |
25012 | 5485 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos); |
5486 olen = current_row->used[TEXT_AREA]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5487 |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5488 /* Ignore trailing spaces, if we can. */ |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5489 if (!write_spaces_p) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5490 while (olen > 0 && CHAR_GLYPH_SPACE_P (obody[olen-1])) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5491 olen--; |
314 | 5492 } |
5493 | |
25012 | 5494 current_row->enabled_p = 1; |
5495 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA]; | |
5496 | |
5497 /* If desired line is empty, just clear the line. */ | |
5498 if (!desired_row->enabled_p) | |
314 | 5499 { |
5500 nlen = 0; | |
5501 goto just_erase; | |
5502 } | |
5503 | |
25012 | 5504 nbody = desired_row->glyphs[TEXT_AREA]; |
5505 nlen = desired_row->used[TEXT_AREA]; | |
5506 nend = nbody + nlen; | |
5507 | |
5508 /* If display line has unknown contents, write the whole line. */ | |
5509 if (must_write_whole_line_p) | |
5510 { | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5511 /* 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
|
5512 if (!write_spaces_p) |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5513 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
|
5514 --nlen; |
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5515 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5516 /* 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
|
5517 if (nlen) |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5518 { |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5519 cursor_to (vpos, 0); |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5520 write_glyphs (nbody, nlen); |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5521 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5522 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5523 /* 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
|
5524 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
|
5525 case but in the line below. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5526 if (nlen < FRAME_TOTAL_COLS (f)) |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5527 { |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5528 cursor_to (vpos, nlen); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5529 clear_end_of_line (FRAME_TOTAL_COLS (f)); |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5530 } |
28682
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5531 else |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5532 /* 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
|
5533 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
|
5534 cursor_to (vpos, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5535 |
25012 | 5536 make_current (desired_matrix, current_matrix, vpos); |
5537 return; | |
5538 } | |
314 | 5539 |
5540 /* Pretend trailing spaces are not there at all, | |
5541 unless for one reason or another we must write all spaces. */ | |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5542 if (!write_spaces_p) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5543 while (nlen > 0 && CHAR_GLYPH_SPACE_P (nbody[nlen - 1])) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5544 nlen--; |
314 | 5545 |
5546 /* If there's no i/d char, quickly do the best we can without it. */ | |
5547 if (!char_ins_del_ok) | |
5548 { | |
25012 | 5549 int i, j; |
5550 | |
5551 /* Find the first glyph in desired row that doesn't agree with | |
5552 a glyph in the current row, and write the rest from there on. */ | |
314 | 5553 for (i = 0; i < nlen; i++) |
5554 { | |
25012 | 5555 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i)) |
314 | 5556 { |
25012 | 5557 /* Find the end of the run of different glyphs. */ |
5558 j = i + 1; | |
5559 while (j < nlen | |
5560 && (j >= olen | |
5561 || !GLYPH_EQUAL_P (nbody + j, obody + j) | |
5562 || CHAR_GLYPH_PADDING_P (nbody[j]))) | |
5563 ++j; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5564 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5565 /* Output this run of non-matching chars. */ |
314 | 5566 cursor_to (vpos, i); |
25012 | 5567 write_glyphs (nbody + i, j - i); |
5568 i = j - 1; | |
314 | 5569 |
5570 /* Now find the next non-match. */ | |
5571 } | |
5572 } | |
5573 | |
5574 /* Clear the rest of the line, or the non-clear part of it. */ | |
5575 if (olen > nlen) | |
5576 { | |
5577 cursor_to (vpos, nlen); | |
5578 clear_end_of_line (olen); | |
5579 } | |
5580 | |
25012 | 5581 /* Make current row = desired row. */ |
5582 make_current (desired_matrix, current_matrix, vpos); | |
314 | 5583 return; |
5584 } | |
5585 | |
25012 | 5586 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete |
5587 characters in a row. */ | |
5588 | |
314 | 5589 if (!olen) |
5590 { | |
25012 | 5591 /* If current line is blank, skip over initial spaces, if |
5592 possible, and write the rest. */ | |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5593 if (write_spaces_p) |
25012 | 5594 nsp = 0; |
5595 else | |
5596 nsp = count_blanks (nbody, nlen); | |
5597 | |
314 | 5598 if (nlen > nsp) |
5599 { | |
5600 cursor_to (vpos, nsp); | |
5601 write_glyphs (nbody + nsp, nlen - nsp); | |
5602 } | |
5603 | |
764 | 5604 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5605 make_current (desired_matrix, current_matrix, vpos); |
314 | 5606 return; |
5607 } | |
5608 | |
5609 /* Compute number of leading blanks in old and new contents. */ | |
25012 | 5610 osp = count_blanks (obody, olen); |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5611 nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen)); |
25012 | 5612 |
5613 /* Compute number of matching chars starting with first non-blank. */ | |
5614 begmatch = count_match (obody + osp, obody + olen, | |
5615 nbody + nsp, nbody + nlen); | |
314 | 5616 |
5617 /* Spaces in new match implicit space past the end of old. */ | |
5618 /* 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
|
5619 if (!write_spaces_p && osp + begmatch == olen) |
314 | 5620 { |
5621 np1 = nbody + nsp; | |
25012 | 5622 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch])) |
5623 ++begmatch; | |
314 | 5624 } |
5625 | |
5626 /* Avoid doing insert/delete char | |
5627 just cause number of leading spaces differs | |
25012 | 5628 when the following text does not match. */ |
314 | 5629 if (begmatch == 0 && osp != nsp) |
5630 osp = nsp = min (osp, nsp); | |
5631 | |
5632 /* Find matching characters at end of line */ | |
5633 op1 = obody + olen; | |
5634 np1 = nbody + nlen; | |
5635 op2 = op1 + begmatch - min (olen - osp, nlen - nsp); | |
25012 | 5636 while (op1 > op2 |
5637 && GLYPH_EQUAL_P (op1 - 1, np1 - 1)) | |
314 | 5638 { |
5639 op1--; | |
5640 np1--; | |
5641 } | |
5642 endmatch = obody + olen - op1; | |
5643 | |
5644 /* tem gets the distance to insert or delete. | |
5645 endmatch is how many characters we save by doing so. | |
5646 Is it worth it? */ | |
5647 | |
5648 tem = (nlen - nsp) - (olen - osp); | |
5649 if (endmatch && tem | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5650 && (!char_ins_del_ok || endmatch <= char_ins_del_cost (f)[tem])) |
314 | 5651 endmatch = 0; |
5652 | |
5653 /* nsp - osp is the distance to insert or delete. | |
5654 If that is nonzero, begmatch is known to be nonzero also. | |
5655 begmatch + endmatch is how much we save by doing the ins/del. | |
5656 Is it worth it? */ | |
5657 | |
5658 if (nsp != osp | |
5659 && (!char_ins_del_ok | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5660 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp])) |
314 | 5661 { |
5662 begmatch = 0; | |
5663 endmatch = 0; | |
5664 osp = nsp = min (osp, nsp); | |
5665 } | |
5666 | |
5667 /* Now go through the line, inserting, writing and | |
5668 deleting as appropriate. */ | |
5669 | |
5670 if (osp > nsp) | |
5671 { | |
5672 cursor_to (vpos, nsp); | |
5673 delete_glyphs (osp - nsp); | |
5674 } | |
5675 else if (nsp > osp) | |
5676 { | |
5677 /* If going to delete chars later in line | |
5678 and insert earlier in the line, | |
5679 must delete first to avoid losing data in the insert */ | |
5680 if (endmatch && nlen < olen + nsp - osp) | |
5681 { | |
5682 cursor_to (vpos, nlen - endmatch + osp - nsp); | |
5683 delete_glyphs (olen + nsp - osp - nlen); | |
5684 olen = nlen - (nsp - osp); | |
5685 } | |
5686 cursor_to (vpos, osp); | |
25012 | 5687 insert_glyphs (0, nsp - osp); |
314 | 5688 } |
5689 olen += nsp - osp; | |
5690 | |
5691 tem = nsp + begmatch + endmatch; | |
5692 if (nlen != tem || olen != tem) | |
5693 { | |
5694 if (!endmatch || nlen == olen) | |
5695 { | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5696 /* 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
|
5697 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
|
5698 (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
|
5699 be "at the margin" after the text is done). */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5700 if (nlen == FRAME_TOTAL_COLS (f)) |
314 | 5701 olen = 0; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5702 |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5703 /* 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
|
5704 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
|
5705 unnecessary cursor movement. */ |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5706 if (nlen - tem > 0) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5707 { |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5708 cursor_to (vpos, nsp + begmatch); |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5709 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
|
5710 } |
314 | 5711 } |
5712 else if (nlen > olen) | |
5713 { | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5714 /* 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
|
5715 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5716 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
|
5717 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
|
5718 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5719 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
|
5720 is a padding glyph. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5721 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
|
5722 int del; |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5723 |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5724 cursor_to (vpos, nsp + begmatch); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5725 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5726 /* 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
|
5727 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
|
5728 out--; |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5729 write_glyphs (nbody + nsp + begmatch, out); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5730 |
25012 | 5731 /* 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
|
5732 del = olen - tem - out; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5733 if (del > 0) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5734 delete_glyphs (del); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5735 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5736 /* 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
|
5737 insert_glyphs (nbody + nsp + begmatch + out, nlen - olen + del); |
314 | 5738 olen = nlen; |
5739 } | |
5740 else if (olen > nlen) | |
5741 { | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5742 cursor_to (vpos, nsp + begmatch); |
314 | 5743 write_glyphs (nbody + nsp + begmatch, nlen - tem); |
5744 delete_glyphs (olen - nlen); | |
5745 olen = nlen; | |
5746 } | |
5747 } | |
5748 | |
5749 just_erase: | |
5750 /* If any unerased characters remain after the new line, erase them. */ | |
5751 if (olen > nlen) | |
5752 { | |
5753 cursor_to (vpos, nlen); | |
5754 clear_end_of_line (olen); | |
5755 } | |
5756 | |
764 | 5757 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5758 make_current (desired_matrix, current_matrix, vpos); |
314 | 5759 } |
25012 | 5760 |
5761 | |
314 | 5762 |
25012 | 5763 /*********************************************************************** |
5764 X/Y Position -> Buffer Position | |
5765 ***********************************************************************/ | |
5766 | |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5767 /* Determine what's under window-relative pixel position (*X, *Y). |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5768 Return the object (string or buffer) that's there. |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5769 Return in *POS the position in that object. |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5770 Adjust *X and *Y to character positions. */ |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5771 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5772 Lisp_Object |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5773 buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height) |
25012 | 5774 struct window *w; |
5775 int *x, *y; | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5776 struct display_pos *pos; |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5777 Lisp_Object *object; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5778 int *dx, *dy; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5779 int *width, *height; |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5780 { |
25012 | 5781 struct it it; |
5782 struct buffer *old_current_buffer = current_buffer; | |
5783 struct text_pos startp; | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5784 Lisp_Object string; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5785 struct glyph_row *row; |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5786 #ifdef HAVE_WINDOW_SYSTEM |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5787 struct image *img = 0; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5788 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5789 int x0, x1; |
25012 | 5790 |
5791 current_buffer = XBUFFER (w->buffer); | |
5792 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
5793 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp))); | |
5794 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp))); | |
5795 start_display (&it, w, startp); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5796 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5797 x0 = *x - WINDOW_LEFT_MARGIN_WIDTH (w); |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5798 move_it_to (&it, -1, x0 + it.first_visible_x, *y, -1, |
25012 | 5799 MOVE_TO_X | MOVE_TO_Y); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5800 |
25012 | 5801 current_buffer = old_current_buffer; |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5802 |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5803 *dx = x0 + it.first_visible_x - it.current_x; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5804 *dy = *y - it.current_y; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5805 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5806 string = w->buffer; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5807 if (STRINGP (it.string)) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5808 string = it.string; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5809 *pos = it.current; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5810 |
53190
053a4dfb6bd4
* dispnew.c (buffer_posn_from_coords): Add ifdef HAVE_WINDOW_SYSTEM
Jan Djärv <jan.h.d@swipnet.se>
parents:
53176
diff
changeset
|
5811 #ifdef HAVE_WINDOW_SYSTEM |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5812 if (it.what == IT_IMAGE) |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5813 { |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5814 if ((img = IMAGE_FROM_ID (it.f, it.image_id)) != NULL |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5815 && !NILP (img->spec)) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5816 *object = img->spec; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5817 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5818 #endif |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5819 |
65016
2b179104bc17
(buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents:
65003
diff
changeset
|
5820 if (it.vpos < w->current_matrix->nrows |
2b179104bc17
(buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents:
65003
diff
changeset
|
5821 && (row = MATRIX_ROW (w->current_matrix, it.vpos), |
2b179104bc17
(buffer_posn_from_coords): Check that target row is
Kim F. Storm <storm@cua.dk>
parents:
65003
diff
changeset
|
5822 row->enabled_p)) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5823 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5824 if (it.hpos < row->used[TEXT_AREA]) |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5825 { |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5826 struct glyph *glyph = row->glyphs[TEXT_AREA] + it.hpos; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5827 #ifdef HAVE_WINDOW_SYSTEM |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5828 if (img) |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5829 { |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5830 *dy -= row->ascent - glyph->ascent; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5831 *dx += glyph->slice.x; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5832 *dy += glyph->slice.y; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5833 /* Image slices positions are still relative to the entire image */ |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5834 *width = img->width; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5835 *height = img->height; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5836 } |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5837 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5838 #endif |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5839 { |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5840 *width = glyph->pixel_width; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5841 *height = glyph->ascent + glyph->descent; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
5842 } |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5843 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5844 else |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5845 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5846 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5847 *height = row->height; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5848 } |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5849 } |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5850 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5851 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5852 *width = *height = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5853 } |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5854 |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5855 /* Add extra (default width) columns if clicked after EOL. */ |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5856 x1 = max(0, it.current_x + it.pixel_width - it.first_visible_x); |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5857 if (x0 > x1) |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5858 it.hpos += (x0 - x1) / WINDOW_FRAME_COLUMN_WIDTH (w); |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5859 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5860 *x = it.hpos; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5861 *y = it.vpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5862 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5863 return string; |
25012 | 5864 } |
5865 | |
5866 | |
5867 /* Value is the string under window-relative coordinates X/Y in the | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5868 mode line or header line (PART says which) of window W, or nil if none. |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5869 *CHARPOS is set to the position in the string returned. */ |
25012 | 5870 |
5871 Lisp_Object | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5872 mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height) |
25012 | 5873 struct window *w; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5874 enum window_part part; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5875 int *x, *y; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5876 int *charpos; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5877 Lisp_Object *object; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5878 int *dx, *dy; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5879 int *width, *height; |
25012 | 5880 { |
5881 struct glyph_row *row; | |
5882 struct glyph *glyph, *end; | |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5883 int x0, y0; |
25012 | 5884 Lisp_Object string = Qnil; |
5885 | |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5886 if (part == ON_MODE_LINE) |
25012 | 5887 row = MATRIX_MODE_LINE_ROW (w->current_matrix); |
5888 else | |
25546 | 5889 row = MATRIX_HEADER_LINE_ROW (w->current_matrix); |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5890 y0 = *y - row->y; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5891 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5892 |
25012 | 5893 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
|
5894 { |
25012 | 5895 /* Find the glyph under X. If we find one with a string object, |
5896 it's the one we were looking for. */ | |
5897 glyph = row->glyphs[TEXT_AREA]; | |
5898 end = glyph + row->used[TEXT_AREA]; | |
59592
c0533d2d03af
(mode_line_string, marginal_area_string): Fix
Kim F. Storm <storm@cua.dk>
parents:
59580
diff
changeset
|
5899 for (x0 = *x; glyph < end && x0 >= glyph->pixel_width; ++glyph) |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5900 x0 -= glyph->pixel_width; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5901 *x = glyph - row->glyphs[TEXT_AREA]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5902 if (glyph < end) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5903 { |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5904 string = glyph->object; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5905 *charpos = glyph->charpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5906 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5907 *height = glyph->ascent + glyph->descent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5908 #ifdef HAVE_WINDOW_SYSTEM |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5909 if (glyph->type == IMAGE_GLYPH) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5910 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5911 struct image *img; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5912 img = IMAGE_FROM_ID (WINDOW_XFRAME (w), glyph->u.img_id); |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5913 if (img != NULL) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5914 *object = img->spec; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5915 y0 -= row->ascent - glyph->ascent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5916 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5917 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5918 } |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5919 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5920 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5921 /* Add extra (default width) columns if clicked after EOL. */ |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5922 *x += x0 / WINDOW_FRAME_COLUMN_WIDTH (w); |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5923 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5924 *height = row->height; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5925 } |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5926 } |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5927 else |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5928 { |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5929 *x = 0; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5930 x0 = 0; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5931 *width = *height = 0; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5932 } |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5933 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5934 *dx = x0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5935 *dy = y0; |
25012 | 5936 |
5937 return string; | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5938 } |
25012 | 5939 |
5940 | |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5941 /* Value is the string under window-relative coordinates X/Y in either |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5942 marginal area, or nil if none. *CHARPOS is set to the position in |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5943 the string returned. */ |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5944 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5945 Lisp_Object |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5946 marginal_area_string (w, part, x, y, charpos, object, dx, dy, width, height) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5947 struct window *w; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5948 enum window_part part; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5949 int *x, *y; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5950 int *charpos; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5951 Lisp_Object *object; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5952 int *dx, *dy; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5953 int *width, *height; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5954 { |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5955 struct glyph_row *row = w->current_matrix->rows; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5956 struct glyph *glyph, *end; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5957 int x0, y0, i, wy = *y; |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5958 int area; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5959 Lisp_Object string = Qnil; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5960 |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5961 if (part == ON_LEFT_MARGIN) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5962 area = LEFT_MARGIN_AREA; |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5963 else if (part == ON_RIGHT_MARGIN) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5964 area = RIGHT_MARGIN_AREA; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5965 else |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5966 abort (); |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5967 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5968 for (i = 0; row->enabled_p && i < w->current_matrix->nrows; ++i, ++row) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5969 if (wy >= row->y && wy < MATRIX_ROW_BOTTOM_Y (row)) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5970 break; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5971 y0 = *y - row->y; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5972 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5973 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5974 if (row->enabled_p) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5975 { |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5976 /* Find the glyph under X. If we find one with a string object, |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5977 it's the one we were looking for. */ |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5978 if (area == RIGHT_MARGIN_AREA) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5979 x0 = ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
5980 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5981 : WINDOW_TOTAL_FRINGE_WIDTH (w)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5982 + window_box_width (w, LEFT_MARGIN_AREA) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5983 + window_box_width (w, TEXT_AREA)); |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5984 else |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5985 x0 = (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
54847
5acc1d864551
(update_window): Only set changed_p if
Kim F. Storm <storm@cua.dk>
parents:
54176
diff
changeset
|
5986 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5987 : 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5988 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5989 glyph = row->glyphs[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5990 end = glyph + row->used[area]; |
59592
c0533d2d03af
(mode_line_string, marginal_area_string): Fix
Kim F. Storm <storm@cua.dk>
parents:
59580
diff
changeset
|
5991 for (x0 = *x - x0; glyph < end && x0 >= glyph->pixel_width; ++glyph) |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5992 x0 -= glyph->pixel_width; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5993 *x = glyph - row->glyphs[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5994 if (glyph < end) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5995 { |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5996 string = glyph->object; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5997 *charpos = glyph->charpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5998 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5999 *height = glyph->ascent + glyph->descent; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6000 #ifdef HAVE_WINDOW_SYSTEM |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6001 if (glyph->type == IMAGE_GLYPH) |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6002 { |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6003 struct image *img; |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6004 img = IMAGE_FROM_ID (WINDOW_XFRAME (w), glyph->u.img_id); |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6005 if (img != NULL) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6006 *object = img->spec; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6007 y0 -= row->ascent - glyph->ascent; |
55021
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
6008 x0 += glyph->slice.x; |
78fbab658433
(buffer_posn_from_coords): Return full image width
Kim F. Storm <storm@cua.dk>
parents:
54847
diff
changeset
|
6009 y0 += glyph->slice.y; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6010 } |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
6011 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6012 } |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6013 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6014 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6015 /* Add extra (default width) columns if clicked after EOL. */ |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6016 *x += x0 / WINDOW_FRAME_COLUMN_WIDTH (w); |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6017 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6018 *height = row->height; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6019 } |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6020 } |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
6021 else |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6022 { |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6023 x0 = 0; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6024 *x = 0; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6025 *width = *height = 0; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6026 } |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
6027 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6028 *dx = x0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
6029 *dy = y0; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6030 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6031 return string; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6032 } |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6033 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
6034 |
25012 | 6035 /*********************************************************************** |
6036 Changing Frame Sizes | |
6037 ***********************************************************************/ | |
314 | 6038 |
6039 #ifdef SIGWINCH | |
25012 | 6040 |
493 | 6041 SIGTYPE |
10745
a553a08f5785
(window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents:
10259
diff
changeset
|
6042 window_change_signal (signalnum) /* If we don't have an argument, */ |
25012 | 6043 int signalnum; /* some compilers complain in signal calls. */ |
314 | 6044 { |
6045 int width, height; | |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
6046 #ifndef USE_CRT_DLL |
314 | 6047 extern int errno; |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
6048 #endif |
314 | 6049 int old_errno = errno; |
6050 | |
58986
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6051 signal (SIGWINCH, window_change_signal); |
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6052 SIGNAL_THREAD_CHECK (signalnum); |
59945307b86b
* syssignal.h: Declare main_thread.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57808
diff
changeset
|
6053 |
764 | 6054 get_frame_size (&width, &height); |
314 | 6055 |
764 | 6056 /* The frame size change obviously applies to a termcap-controlled |
6057 frame. Find such a frame in the list, and assume it's the only | |
314 | 6058 one (since the redisplay code always writes to stdout, not a |
764 | 6059 FILE * specified in the frame structure). Record the new size, |
314 | 6060 but don't reallocate the data structures now. Let that be done |
6061 later outside of the signal handler. */ | |
6062 | |
6063 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6064 Lisp_Object tail, frame; |
314 | 6065 |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6066 FOR_EACH_FRAME (tail, frame) |
314 | 6067 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6068 if (FRAME_TERMCAP_P (XFRAME (frame))) |
314 | 6069 { |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6070 change_frame_size (XFRAME (frame), height, width, 0, 1, 0); |
314 | 6071 break; |
6072 } | |
6073 } | |
6074 } | |
6075 | |
6076 errno = old_errno; | |
6077 } | |
6078 #endif /* SIGWINCH */ | |
6079 | |
6080 | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6081 /* 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
|
6082 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
|
6083 safe to change frame sizes while a redisplay is in progress. */ |
314 | 6084 |
21514 | 6085 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6086 do_pending_window_change (safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6087 int safe; |
314 | 6088 { |
6089 /* 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
|
6090 if (redisplaying_p && !safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6091 return; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6092 |
314 | 6093 while (delayed_size_change) |
6094 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6095 Lisp_Object tail, frame; |
314 | 6096 |
6097 delayed_size_change = 0; | |
6098 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6099 FOR_EACH_FRAME (tail, frame) |
314 | 6100 { |
25012 | 6101 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
|
6102 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6103 if (f->new_text_lines != 0 || f->new_text_cols != 0) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6104 change_frame_size (f, f->new_text_lines, f->new_text_cols, |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6105 0, 0, safe); |
314 | 6106 } |
6107 } | |
6108 } | |
6109 | |
6110 | |
764 | 6111 /* Change the frame height and/or width. Values may be given as zero to |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6112 indicate no change is to take place. |
314 | 6113 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6114 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
|
6115 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
|
6116 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
|
6117 from a signal handler. |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6118 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6119 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
|
6120 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
|
6121 |
21514 | 6122 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6123 change_frame_size (f, newheight, newwidth, pretend, delay, safe) |
25012 | 6124 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6125 int newheight, newwidth, pretend, delay, safe; |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6126 { |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6127 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
|
6128 |
15395
b584c2db055f
(change_frame_size, remake_frame_glyphs): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents:
15394
diff
changeset
|
6129 if (! FRAME_WINDOW_P (f)) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6130 { |
15394
8d01f71c4797
(Fredraw_frame, remake_frame_glyphs)
Richard M. Stallman <rms@gnu.org>
parents:
15282
diff
changeset
|
6131 /* 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
|
6132 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
|
6133 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
|
6134 if (! FRAME_WINDOW_P (XFRAME (frame))) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6135 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
|
6136 pretend, delay, safe); |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6137 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6138 else |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6139 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
|
6140 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6141 |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6142 static void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6143 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) |
25012 | 6144 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6145 int newheight, newwidth, pretend, delay, safe; |
314 | 6146 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6147 int new_frame_total_cols; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
44890
diff
changeset
|
6148 int count = SPECPDL_INDEX (); |
16881
245ba9f2781a
(change_frame_size_1): Reject new sizes if they cause overflow.
Richard M. Stallman <rms@gnu.org>
parents:
16822
diff
changeset
|
6149 |
314 | 6150 /* 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
|
6151 if (delay || (redisplaying_p && !safe)) |
314 | 6152 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6153 f->new_text_lines = newheight; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6154 f->new_text_cols = newwidth; |
314 | 6155 delayed_size_change = 1; |
6156 return; | |
6157 } | |
6158 | |
764 | 6159 /* This size-change overrides any pending one for this frame. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6160 f->new_text_lines = 0; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6161 f->new_text_cols = 0; |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6162 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
6163 /* 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
|
6164 if (newheight == 0) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6165 newheight = FRAME_LINES (f); |
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
6166 if (newwidth == 0) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6167 newwidth = FRAME_COLS (f); |
25012 | 6168 |
6169 /* Compute width of windows in F. | |
6170 This is the width of the frame without vertical scroll bars. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6171 new_frame_total_cols = FRAME_TOTAL_COLS_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
|
6172 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6173 /* Round up to the smallest acceptable size. */ |
25012 | 6174 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
|
6175 |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6176 /* If we're not changing the frame size, quit now. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6177 if (newheight == FRAME_LINES (f) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6178 && new_frame_total_cols == FRAME_TOTAL_COLS (f)) |
314 | 6179 return; |
6180 | |
15078 | 6181 BLOCK_INPUT; |
6182 | |
14286
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6183 #ifdef MSDOS |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6184 /* 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
|
6185 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
|
6186 or equal to the requested dimensions. */ |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6187 dos_set_window_size (&newheight, &newwidth); |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6188 #endif |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6189 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6190 if (newheight != FRAME_LINES (f)) |
314 | 6191 { |
25012 | 6192 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) |
314 | 6193 { |
25012 | 6194 /* Frame has both root and mini-buffer. */ |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6195 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top_line, |
25012 | 6196 FRAME_TOP_MARGIN (f)); |
6197 set_window_height (FRAME_ROOT_WINDOW (f), | |
6198 (newheight | |
6199 - 1 | |
6200 - FRAME_TOP_MARGIN (f)), | |
6201 0); | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6202 XSETFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top_line, |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
6203 newheight - 1); |
25012 | 6204 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0); |
314 | 6205 } |
6206 else | |
764 | 6207 /* Frame has just one top-level window. */ |
25012 | 6208 set_window_height (FRAME_ROOT_WINDOW (f), |
6209 newheight - FRAME_TOP_MARGIN (f), 0); | |
6210 | |
6211 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
|
6212 FrameRows = newheight; |
314 | 6213 } |
6214 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6215 if (new_frame_total_cols != FRAME_TOTAL_COLS (f)) |
314 | 6216 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6217 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_total_cols, 0); |
25012 | 6218 if (FRAME_HAS_MINIBUF_P (f)) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6219 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0); |
25012 | 6220 |
6221 if (FRAME_TERMCAP_P (f) && !pretend) | |
764 | 6222 FrameCols = newwidth; |
25012 | 6223 |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
6224 if (WINDOWP (f->tool_bar_window)) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6225 XSETFASTINT (XWINDOW (f->tool_bar_window)->total_cols, newwidth); |
314 | 6226 } |
6227 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6228 FRAME_LINES (f) = newheight; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6229 SET_FRAME_COLS (f, newwidth); |
25012 | 6230 |
6231 { | |
6232 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
6233 int text_area_x, text_area_y, text_area_width, text_area_height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6234 |
25012 | 6235 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width, |
6236 &text_area_height); | |
6237 if (w->cursor.x >= text_area_x + text_area_width) | |
6238 w->cursor.hpos = w->cursor.x = 0; | |
6239 if (w->cursor.y >= text_area_y + text_area_height) | |
6240 w->cursor.vpos = w->cursor.y = 0; | |
6241 } | |
6242 | |
6243 adjust_glyphs (f); | |
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6244 calculate_costs (f); |
25012 | 6245 SET_FRAME_GARBAGED (f); |
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6246 f->resized_p = 1; |
15065 | 6247 |
6248 UNBLOCK_INPUT; | |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
6249 |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6250 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
|
6251 |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
6252 /* This isn't quite a no-op: it runs window-configuration-change-hook. */ |
25012 | 6253 Fset_window_buffer (FRAME_SELECTED_WINDOW (f), |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6254 XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer, Qt); |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6255 |
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6256 unbind_to (count, Qnil); |
314 | 6257 } |
25012 | 6258 |
6259 | |
314 | 6260 |
25012 | 6261 /*********************************************************************** |
6262 Terminal Related Lisp Functions | |
6263 ***********************************************************************/ | |
6264 | |
6265 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript, | |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6266 1, 1, "FOpen termscript file: ", |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6267 doc: /* Start writing all terminal output to FILE as well as the terminal. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6268 FILE = nil means just close any termscript file currently open. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6269 (file) |
25012 | 6270 Lisp_Object file; |
6271 { | |
6272 if (termscript != 0) fclose (termscript); | |
6273 termscript = 0; | |
6274 | |
6275 if (! NILP (file)) | |
6276 { | |
6277 file = Fexpand_file_name (file, Qnil); | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6278 termscript = fopen (SDATA (file), "w"); |
25012 | 6279 if (termscript == 0) |
6280 report_file_error ("Opening termscript", Fcons (file, Qnil)); | |
6281 } | |
6282 return Qnil; | |
6283 } | |
6284 | |
6285 | |
314 | 6286 DEFUN ("send-string-to-terminal", Fsend_string_to_terminal, |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6287 Ssend_string_to_terminal, 1, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6288 doc: /* Send STRING to the terminal without alteration. |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6289 Control characters in STRING will have terminal-dependent effects. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6290 (string) |
14068
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
6291 Lisp_Object string; |
314 | 6292 { |
20618
d5acac3af6e3
(Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents:
19627
diff
changeset
|
6293 /* ??? Perhaps we should do something special for multibyte strings here. */ |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6294 CHECK_STRING (string); |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6295 fwrite (SDATA (string), 1, SBYTES (string), stdout); |
314 | 6296 fflush (stdout); |
6297 if (termscript) | |
6298 { | |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6299 fwrite (SDATA (string), 1, SBYTES (string), |
21244
50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
Richard M. Stallman <rms@gnu.org>
parents:
20708
diff
changeset
|
6300 termscript); |
314 | 6301 fflush (termscript); |
6302 } | |
6303 return Qnil; | |
6304 } | |
6305 | |
25012 | 6306 |
314 | 6307 DEFUN ("ding", Fding, Sding, 0, 1, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6308 doc: /* Beep, or flash the screen. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6309 Also, unless an argument is given, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6310 terminate any keyboard macro currently executing. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6311 (arg) |
314 | 6312 Lisp_Object arg; |
6313 { | |
493 | 6314 if (!NILP (arg)) |
314 | 6315 { |
649
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6316 if (noninteractive) |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6317 putchar (07); |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6318 else |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6319 ring_bell (); |
314 | 6320 fflush (stdout); |
6321 } | |
6322 else | |
6323 bitch_at_user (); | |
6324 | |
6325 return Qnil; | |
6326 } | |
6327 | |
21514 | 6328 void |
314 | 6329 bitch_at_user () |
6330 { | |
6331 if (noninteractive) | |
6332 putchar (07); | |
25012 | 6333 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ |
314 | 6334 error ("Keyboard macro terminated by a command ringing the bell"); |
6335 else | |
6336 ring_bell (); | |
6337 fflush (stdout); | |
6338 } | |
6339 | |
25012 | 6340 |
6341 | |
6342 /*********************************************************************** | |
6343 Sleeping, Waiting | |
6344 ***********************************************************************/ | |
6345 | |
314 | 6346 DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6347 doc: /* Pause, without updating display, for SECONDS seconds. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6348 SECONDS may be a floating-point value, meaning that you can wait for a |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6349 fraction of a second. Optional second arg MILLISECONDS specifies an |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6350 additional wait period, in milliseconds; this may be useful if your |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6351 Emacs was built without floating point support. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6352 \(Not all operating systems support waiting for a fraction of a second.) */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6353 (seconds, milliseconds) |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6354 Lisp_Object seconds, milliseconds; |
314 | 6355 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6356 int sec, usec; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6357 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6358 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
|
6359 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
|
6360 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6361 CHECK_NUMBER (milliseconds); |
2648 | 6362 usec = XINT (milliseconds) * 1000; |
6363 | |
6364 { | |
6365 double duration = extract_float (seconds); | |
6366 sec = (int) duration; | |
6367 usec += (duration - sec) * 1000000; | |
6368 } | |
314 | 6369 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6370 #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
|
6371 if (sec == 0 && usec != 0) |
63695
98563021d2e3
(Fsleep_for, Fsit_for): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
6372 error ("Millisecond `sleep-for' not supported on %s", SYSTEM_TYPE); |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6373 #endif |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6374 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6375 /* 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
|
6376 if (usec < 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6377 { |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
6378 /* We can't rely on the rounding being correct if usec is negative. */ |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6379 if (-1000000 < usec) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6380 sec--, usec += 1000000; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6381 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6382 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
|
6383 } |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6384 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6385 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
|
6386 |
14646
68fe10d1abd0
(Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents:
14459
diff
changeset
|
6387 if (sec < 0 || (sec == 0 && usec == 0)) |
314 | 6388 return Qnil; |
6389 | |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6390 wait_reading_process_output (sec, usec, 0, 0, Qnil, NULL, 0); |
314 | 6391 |
6392 return Qnil; | |
6393 } | |
6394 | |
25012 | 6395 |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6396 /* This is just like wait_reading_process_output, except that |
650 | 6397 it does the redisplay. |
6398 | |
5223
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
6399 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
|
6400 waiting for input as well. */ |
650 | 6401 |
6402 Lisp_Object | |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6403 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
|
6404 int sec, usec, reading, display, initial_display; |
314 | 6405 { |
14964
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6406 swallow_events (display); |
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6407 |
61989
820ed588bcf4
(sit_for): Vexecuting_macro -> Vexecuting_kbd_macro.
Luc Teirlinck <teirllm@auburn.edu>
parents:
61633
diff
changeset
|
6408 if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_kbd_macro)) |
314 | 6409 return Qnil; |
650 | 6410 |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6411 if (initial_display) |
35336
002c02db42d3
Call redisplay_preserve_echo_area with additional arg.
Gerd Moellmann <gerd@gnu.org>
parents:
35307
diff
changeset
|
6412 redisplay_preserve_echo_area (2); |
314 | 6413 |
673 | 6414 if (sec == 0 && usec == 0) |
6415 return Qt; | |
6416 | |
314 | 6417 #ifdef SIGIO |
1915
98ecf99d7b1a
* dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
1872
diff
changeset
|
6418 gobble_input (0); |
650 | 6419 #endif |
6420 | |
56727
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6421 wait_reading_process_output (sec, usec, reading ? -1 : 1, display, |
6b028bf60b4e
(Fsleep_for): Remove obsolete code.
Kim F. Storm <storm@cua.dk>
parents:
56717
diff
changeset
|
6422 Qnil, NULL, 0); |
650 | 6423 |
314 | 6424 return detect_input_pending () ? Qnil : Qt; |
6425 } | |
6426 | |
25012 | 6427 |
650 | 6428 DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0, |
40979 | 6429 doc: /* Perform redisplay, then wait for SECONDS seconds or until input is available. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6430 SECONDS may be a floating-point value, meaning that you can wait for a |
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6431 fraction of a second. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6432 \(Not all operating systems support waiting for a fraction of a second.) |
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6433 Optional arg NODISP non-nil means don't redisplay, just wait for input. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6434 Redisplay is preempted as always if input arrives, and does not happen |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6435 if input is available before it starts. |
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6436 Value is t if waited the full time with no input arriving. |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6437 |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6438 An obsolete but still supported form is |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6439 \(sit-for SECONDS &optional MILLISECONDS NODISP) |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6440 Where the optional arg MILLISECONDS specifies an additional wait period, |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6441 in milliseconds; this was useful when Emacs was built without |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6442 floating point support. |
51413
d40ff6314d84
(Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51232
diff
changeset
|
6443 usage: (sit-for SECONDS &optional NODISP OLD-NODISP) */) |
d40ff6314d84
(Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51232
diff
changeset
|
6444 |
d40ff6314d84
(Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51232
diff
changeset
|
6445 /* The `old-nodisp' stuff is there so that the arglist has the correct |
d40ff6314d84
(Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51232
diff
changeset
|
6446 length. Otherwise, `defdvice' will redefine it with fewer args. */ |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6447 (seconds, milliseconds, nodisp) |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6448 Lisp_Object seconds, milliseconds, nodisp; |
650 | 6449 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6450 int sec, usec; |
650 | 6451 |
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6452 if (NILP (nodisp) && !NUMBERP (milliseconds)) |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6453 { /* New style. */ |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6454 nodisp = milliseconds; |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6455 milliseconds = Qnil; |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6456 } |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6457 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6458 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
|
6459 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
|
6460 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6461 CHECK_NUMBER (milliseconds); |
2648 | 6462 usec = XINT (milliseconds) * 1000; |
6463 | |
6464 { | |
6465 double duration = extract_float (seconds); | |
6466 sec = (int) duration; | |
6467 usec += (duration - sec) * 1000000; | |
6468 } | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6469 |
650 | 6470 #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
|
6471 if (usec != 0 && sec == 0) |
63695
98563021d2e3
(Fsleep_for, Fsit_for): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
63649
diff
changeset
|
6472 error ("Millisecond `sit-for' not supported on %s", SYSTEM_TYPE); |
650 | 6473 #endif |
6474 | |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6475 return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp)); |
650 | 6476 } |
25012 | 6477 |
6478 | |
314 | 6479 |
25012 | 6480 /*********************************************************************** |
6481 Other Lisp Functions | |
6482 ***********************************************************************/ | |
6483 | |
6484 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the | |
6485 session's frames, frame names, buffers, buffer-read-only flags, and | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6486 buffer-modified-flags. */ |
25012 | 6487 |
6488 static Lisp_Object frame_and_buffer_state; | |
6489 | |
6490 | |
6491 DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p, | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6492 Sframe_or_buffer_changed_p, 0, 1, 0, |
40979 | 6493 doc: /* Return non-nil if the frame and buffer state appears to have changed. |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6494 VARIABLE is a variable name whose value is either nil or a state vector |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6495 that will be updated to contain all frames and buffers, |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6496 aside from buffers whose names start with space, |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6497 along with the buffers' read-only and modified flags. This allows a fast |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6498 check to see whether buffer menus might need to be recomputed. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6499 If this function returns non-nil, it updates the internal vector to reflect |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6500 the current state. |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6501 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6502 If VARIABLE is nil, an internal variable is used. Users should not |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6503 pass nil for VARIABLE. */) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6504 (variable) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6505 Lisp_Object variable; |
25012 | 6506 { |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6507 Lisp_Object state, tail, frame, buf; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6508 Lisp_Object *vecp, *end; |
25012 | 6509 int n; |
6510 | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6511 if (! NILP (variable)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6512 { |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6513 CHECK_SYMBOL (variable); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6514 state = Fsymbol_value (variable); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6515 if (! VECTORP (state)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6516 goto changed; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6517 } |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6518 else |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6519 state = frame_and_buffer_state; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6520 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6521 vecp = XVECTOR (state)->contents; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6522 end = vecp + XVECTOR (state)->size; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6523 |
25012 | 6524 FOR_EACH_FRAME (tail, frame) |
6525 { | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6526 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6527 goto changed; |
25012 | 6528 if (!EQ (*vecp++, frame)) |
6529 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6530 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6531 goto changed; |
25012 | 6532 if (!EQ (*vecp++, XFRAME (frame)->name)) |
6533 goto changed; | |
6534 } | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6535 /* Check that the buffer info matches. */ |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6536 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6537 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6538 buf = XCDR (XCAR (tail)); |
25012 | 6539 /* Ignore buffers that aren't included in buffer lists. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6540 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
25012 | 6541 continue; |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6542 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6543 goto changed; |
25012 | 6544 if (!EQ (*vecp++, buf)) |
6545 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6546 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6547 goto changed; |
25012 | 6548 if (!EQ (*vecp++, XBUFFER (buf)->read_only)) |
6549 goto changed; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6550 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6551 goto changed; |
25012 | 6552 if (!EQ (*vecp++, Fbuffer_modified_p (buf))) |
6553 goto changed; | |
6554 } | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6555 if (vecp == end) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6556 goto changed; |
25012 | 6557 /* Detect deletion of a buffer at the end of the list. */ |
6558 if (EQ (*vecp, Qlambda)) | |
6559 return Qnil; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6560 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6561 /* Come here if we decide the data has changed. */ |
25012 | 6562 changed: |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6563 /* Count the size we will need. |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6564 Start with 1 so there is room for at least one lambda at the end. */ |
25012 | 6565 n = 1; |
6566 FOR_EACH_FRAME (tail, frame) | |
6567 n += 2; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6568 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6569 n += 3; |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6570 /* Reallocate the vector if data has grown to need it, |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6571 or if it has shrunk a lot. */ |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6572 if (! VECTORP (state) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6573 || n > XVECTOR (state)->size |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6574 || n + 20 < XVECTOR (state)->size / 2) |
25012 | 6575 /* Add 20 extra so we grow it less often. */ |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6576 { |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6577 state = Fmake_vector (make_number (n + 20), Qlambda); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6578 if (! NILP (variable)) |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6579 Fset (variable, state); |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6580 else |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6581 frame_and_buffer_state = state; |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6582 } |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6583 |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6584 /* Record the new data in the (possibly reallocated) vector. */ |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6585 vecp = XVECTOR (state)->contents; |
25012 | 6586 FOR_EACH_FRAME (tail, frame) |
6587 { | |
6588 *vecp++ = frame; | |
6589 *vecp++ = XFRAME (frame)->name; | |
6590 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6591 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6592 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6593 buf = XCDR (XCAR (tail)); |
25012 | 6594 /* Ignore buffers that aren't included in buffer lists. */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6595 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
25012 | 6596 continue; |
6597 *vecp++ = buf; | |
6598 *vecp++ = XBUFFER (buf)->read_only; | |
6599 *vecp++ = Fbuffer_modified_p (buf); | |
6600 } | |
6601 /* Fill up the vector with lambdas (always at least one). */ | |
6602 *vecp++ = Qlambda; | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6603 while (vecp - XVECTOR (state)->contents |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6604 < XVECTOR (state)->size) |
25012 | 6605 *vecp++ = Qlambda; |
6606 /* Make sure we didn't overflow the vector. */ | |
64776
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6607 if (vecp - XVECTOR (state)->contents |
42f593faa113
(Fframe_or_buffer_changed_p): Take an arg
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
6608 > XVECTOR (state)->size) |
25012 | 6609 abort (); |
6610 return Qt; | |
6611 } | |
6612 | |
6613 | |
6614 | |
6615 /*********************************************************************** | |
6616 Initialization | |
6617 ***********************************************************************/ | |
6618 | |
314 | 6619 char *terminal_type; |
6620 | |
25012 | 6621 /* Initialization done when Emacs fork is started, before doing stty. |
6622 Determine terminal type and set terminal_driver. Then invoke its | |
6623 decoding routine to set up variables in the terminal package. */ | |
314 | 6624 |
21514 | 6625 void |
314 | 6626 init_display () |
6627 { | |
6628 #ifdef HAVE_X_WINDOWS | |
6629 extern int display_arg; | |
6630 #endif | |
6631 | |
25012 | 6632 /* Construct the space glyph. */ |
6633 space_glyph.type = CHAR_GLYPH; | |
6634 SET_CHAR_GLYPH_FROM_GLYPH (space_glyph, ' '); | |
6635 space_glyph.charpos = -1; | |
6636 | |
314 | 6637 meta_key = 0; |
6638 inverse_video = 0; | |
6639 cursor_in_echo_area = 0; | |
6640 terminal_type = (char *) 0; | |
6641 | |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6642 /* 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
|
6643 during startup. */ |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6644 Vwindow_system = Qnil; |
314 | 6645 |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6646 /* 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
|
6647 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
|
6648 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
|
6649 using the window system. |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6650 |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6651 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
|
6652 try to use X, and die with an error message if that doesn't work. */ |
314 | 6653 |
6654 #ifdef HAVE_X_WINDOWS | |
69952
b9da898695a5
* dispnew.c (init_display): Don't init X display if the user asked
Jan Djärv <jan.h.d@swipnet.se>
parents:
69607
diff
changeset
|
6655 if (! inhibit_window_system && ! display_arg) |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6656 { |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6657 char *display; |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6658 #ifdef VMS |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6659 display = getenv ("DECW$DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6660 #else |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6661 display = getenv ("DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6662 #endif |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6663 |
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6664 display_arg = (display != 0 && *display != 0); |
69607
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6665 |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6666 if (display_arg && !x_display_ok (display)) |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6667 { |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6668 fprintf (stderr, "Display %s unavailable, simulating -nw\n", |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6669 display); |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6670 inhibit_window_system = 1; |
761eaec1aae4
* dispnew.c (init_display): Check DISPLAY here.
Andreas Schwab <schwab@suse.de>
parents:
69110
diff
changeset
|
6671 } |
2364 | 6672 } |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6673 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6674 if (!inhibit_window_system && display_arg |
18774
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6675 #ifndef CANNOT_DUMP |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6676 && initialized |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6677 #endif |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6678 ) |
314 | 6679 { |
6680 Vwindow_system = intern ("x"); | |
6681 #ifdef HAVE_X11 | |
6682 Vwindow_system_version = make_number (11); | |
6683 #else | |
6684 Vwindow_system_version = make_number (10); | |
6685 #endif | |
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
6686 #if defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) |
15273
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6687 /* In some versions of ncurses, |
15282 | 6688 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
|
6689 So call tgetent. */ |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6690 { char b[2044]; tgetent (b, "xterm");} |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6691 #endif |
25012 | 6692 adjust_frame_glyphs_initially (); |
314 | 6693 return; |
6694 } | |
6695 #endif /* HAVE_X_WINDOWS */ | |
6696 | |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6697 #ifdef HAVE_NTGUI |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6698 if (!inhibit_window_system) |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6699 { |
16589
ec300a10e407
(init_display) [HAVE_NTGUI]: Use w32 for window-system.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16412
diff
changeset
|
6700 Vwindow_system = intern ("w32"); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6701 Vwindow_system_version = make_number (1); |
25012 | 6702 adjust_frame_glyphs_initially (); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6703 return; |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6704 } |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6705 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6706 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6707 #ifdef MAC_OS |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6708 if (!inhibit_window_system) |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6709 { |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6710 Vwindow_system = intern ("mac"); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6711 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
|
6712 adjust_frame_glyphs_initially (); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6713 return; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6714 } |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6715 #endif /* MAC_OS */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6716 |
314 | 6717 /* If no window system has been specified, try to use the terminal. */ |
6718 if (! isatty (0)) | |
6719 { | |
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
6720 fatal ("standard input is not a tty"); |
314 | 6721 exit (1); |
6722 } | |
6723 | |
42835
38f2be5a65fd
(update_frame): Move the variable `tem' to the block where it is used.
Pavel Janík <Pavel@Janik.cz>
parents:
41969
diff
changeset
|
6724 /* Look at the TERM variable. */ |
314 | 6725 terminal_type = (char *) getenv ("TERM"); |
6726 if (!terminal_type) | |
6727 { | |
6728 #ifdef VMS | |
6729 fprintf (stderr, "Please specify your terminal type.\n\ | |
6730 For types defined in VMS, use set term /device=TYPE.\n\ | |
6731 For types not defined in VMS, use define emacs_term \"TYPE\".\n\ | |
6732 \(The quotation marks are necessary since terminal types are lower case.)\n"); | |
6733 #else | |
6734 fprintf (stderr, "Please set the environment variable TERM; see tset(1).\n"); | |
6735 #endif | |
6736 exit (1); | |
6737 } | |
6738 | |
6739 #ifdef VMS | |
25012 | 6740 /* VMS DCL tends to up-case things, so down-case term type. |
314 | 6741 Hardly any uppercase letters in terminal types; should be none. */ |
6742 { | |
6743 char *new = (char *) xmalloc (strlen (terminal_type) + 1); | |
6744 char *p; | |
6745 | |
6746 strcpy (new, terminal_type); | |
6747 | |
6748 for (p = new; *p; p++) | |
6749 if (isupper (*p)) | |
6750 *p = tolower (*p); | |
6751 | |
6752 terminal_type = new; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6753 } |
25012 | 6754 #endif /* VMS */ |
314 | 6755 |
6756 term_init (terminal_type); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6757 |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6758 { |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6759 struct frame *sf = SELECTED_FRAME (); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6760 int width = FRAME_TOTAL_COLS (sf); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6761 int height = FRAME_LINES (sf); |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6762 |
25012 | 6763 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph); |
6764 | |
6765 /* If these sizes are so big they cause overflow, just ignore the | |
6766 change. It's not clear what better we could do. */ | |
6767 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
|
6768 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
|
6769 } |
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6770 |
25012 | 6771 adjust_frame_glyphs_initially (); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6772 calculate_costs (XFRAME (selected_frame)); |
314 | 6773 |
6774 #ifdef SIGWINCH | |
6775 #ifndef CANNOT_DUMP | |
6776 if (initialized) | |
6777 #endif /* CANNOT_DUMP */ | |
6778 signal (SIGWINCH, window_change_signal); | |
6779 #endif /* SIGWINCH */ | |
25012 | 6780 |
6781 /* Set up faces of the initial terminal frame of a dumped Emacs. */ | |
6782 if (initialized | |
6783 && !noninteractive | |
25118
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6784 #ifdef MSDOS |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6785 /* 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
|
6786 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
|
6787 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
|
6788 and internal_terminal_init. */ |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6789 && (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
|
6790 #endif |
25012 | 6791 && NILP (Vwindow_system)) |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6792 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6793 /* 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
|
6794 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
|
6795 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
|
6796 |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
6797 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
|
6798 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
|
6799 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
|
6800 } |
314 | 6801 } |
25012 | 6802 |
6803 | |
314 | 6804 |
25012 | 6805 /*********************************************************************** |
6806 Blinking cursor | |
6807 ***********************************************************************/ | |
6808 | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6809 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
|
6810 Sinternal_show_cursor, 2, 2, 0, |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6811 doc: /* Set the cursor-visibility flag of WINDOW to SHOW. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6812 WINDOW nil means use the selected window. SHOW non-nil means |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6813 show a cursor in WINDOW in the next redisplay. SHOW nil means |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6814 don't show a cursor. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6815 (window, show) |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6816 Lisp_Object window, show; |
25012 | 6817 { |
6818 /* Don't change cursor state while redisplaying. This could confuse | |
6819 output routines. */ | |
6820 if (!redisplaying_p) | |
6821 { | |
6822 if (NILP (window)) | |
6823 window = selected_window; | |
6824 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6825 CHECK_WINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6826 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6827 XWINDOW (window)->cursor_off_p = NILP (show); |
25012 | 6828 } |
6829 | |
6830 return Qnil; | |
6831 } | |
6832 | |
6833 | |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6834 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
|
6835 Sinternal_show_cursor_p, 0, 1, 0, |
40979 | 6836 doc: /* Value is non-nil if next redisplay will display a cursor in WINDOW. |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6837 WINDOW nil or omitted means report on the selected window. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6838 (window) |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6839 Lisp_Object window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6840 { |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6841 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6842 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6843 if (NILP (window)) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6844 window = selected_window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6845 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6846 CHECK_WINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6847 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6848 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6849 return w->cursor_off_p ? Qnil : Qt; |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6850 } |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6851 |
25012 | 6852 |
6853 /*********************************************************************** | |
6854 Initialization | |
6855 ***********************************************************************/ | |
6856 | |
21514 | 6857 void |
314 | 6858 syms_of_display () |
6859 { | |
764 | 6860 defsubr (&Sredraw_frame); |
314 | 6861 defsubr (&Sredraw_display); |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6862 defsubr (&Sframe_or_buffer_changed_p); |
314 | 6863 defsubr (&Sopen_termscript); |
6864 defsubr (&Sding); | |
6865 defsubr (&Ssit_for); | |
6866 defsubr (&Ssleep_for); | |
6867 defsubr (&Ssend_string_to_terminal); | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6868 defsubr (&Sinternal_show_cursor); |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6869 defsubr (&Sinternal_show_cursor_p); |
314 | 6870 |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
6871 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6872 defsubr (&Sdump_redisplay_history); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6873 #endif |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6874 |
12186
6811992e871c
(Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents:
11919
diff
changeset
|
6875 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
|
6876 staticpro (&frame_and_buffer_state); |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6877 |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6878 Qdisplay_table = intern ("display-table"); |
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6879 staticpro (&Qdisplay_table); |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6880 Qredisplay_dont_pause = intern ("redisplay-dont-pause"); |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6881 staticpro (&Qredisplay_dont_pause); |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6882 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6883 DEFVAR_INT ("baud-rate", &baud_rate, |
40979 | 6884 doc: /* *The output baud rate of the terminal. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6885 On most systems, changing this value will affect the amount of padding |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6886 and the other strategic decisions made during redisplay. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6887 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6888 DEFVAR_BOOL ("inverse-video", &inverse_video, |
40979 | 6889 doc: /* *Non-nil means invert the entire frame display. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6890 This means everything is in inverse video which otherwise would not be. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6891 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6892 DEFVAR_BOOL ("visible-bell", &visible_bell, |
40979 | 6893 doc: /* *Non-nil means try to flash the frame to represent a bell. |
40334
bee6cc2e8a90
(syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents:
40271
diff
changeset
|
6894 |
bee6cc2e8a90
(syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents:
40271
diff
changeset
|
6895 See also `ring-bell-function'. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6896 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6897 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, |
40979 | 6898 doc: /* *Non-nil means no need to redraw entire frame after suspending. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6899 A non-nil value is useful if the terminal can automatically preserve |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6900 Emacs's frame display when you reenter Emacs. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6901 It is up to you to set this variable if your terminal can do that. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6902 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6903 DEFVAR_LISP ("window-system", &Vwindow_system, |
41025
4feeae90afa4
(syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40979
diff
changeset
|
6904 doc: /* Name of window system that Emacs is displaying through. |
4feeae90afa4
(syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40979
diff
changeset
|
6905 The value is a symbol--for instance, `x' for X windows. |
4feeae90afa4
(syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40979
diff
changeset
|
6906 The value is nil if Emacs is using a text-only terminal. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6907 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6908 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, |
40979 | 6909 doc: /* The version number of the window system in use. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6910 For X windows, this is 10 or 11. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6911 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6912 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, |
40979 | 6913 doc: /* Non-nil means put cursor in minibuffer, at end of any message there. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6914 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6915 DEFVAR_LISP ("glyph-table", &Vglyph_table, |
40979 | 6916 doc: /* Table defining how to output a glyph code to the frame. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6917 If not nil, this is a vector indexed by glyph code to define the glyph. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6918 Each element can be: |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6919 integer: a glyph code which this glyph is an alias for. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6920 string: output this glyph using that string (not impl. in X windows). |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6921 nil: this glyph mod 524288 is the code of a character to output, |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6922 and this glyph / 524288 is the face number (see `face-id') to use |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6923 while outputting it. */); |
314 | 6924 Vglyph_table = Qnil; |
6925 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6926 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table, |
40979 | 6927 doc: /* Display table to use for buffers that specify none. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6928 See `buffer-display-table' for more information. */); |
314 | 6929 Vstandard_display_table = Qnil; |
6930 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6931 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause, |
40979 | 6932 doc: /* *Non-nil means update isn't paused when input is detected. */); |
25012 | 6933 redisplay_dont_pause = 0; |
6934 | |
314 | 6935 /* Initialize `window-system', unless init_display already decided it. */ |
6936 #ifdef CANNOT_DUMP | |
6937 if (noninteractive) | |
6938 #endif | |
6939 { | |
6940 Vwindow_system = Qnil; | |
6941 Vwindow_system_version = Qnil; | |
6942 } | |
6943 } | |
52401 | 6944 |
6945 /* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413 | |
6946 (do not change this comment) */ |