Mercurial > emacs
annotate src/dispnew.c @ 83059:af4a10a1bd55
Revert patch-93, that was the real culprit. Reapply patch-97.
src/keyboard.c (read_avail_input): Don't BLOCK_INPUT.
src/xterm.c (XTread_socket): Don't try to handle a new event if the
input buffer is full.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-99
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 25 Feb 2004 03:29:37 +0000 |
parents | 03a73693678e |
children | a871be7b26a5 |
rev | line source |
---|---|
314 | 1 /* Updating of data structures for redisplay. |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
2 Copyright (C) 1985,86,87,88,93,94,95,97,98,1999,2000,01,02,03,04 |
18853
4501a367a887
(direct_output_forward_char): Reenable check against
Richard M. Stallman <rms@gnu.org>
parents:
18774
diff
changeset
|
3 Free Software Foundation, Inc. |
314 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
7 GNU Emacs is free software; you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1766
diff
changeset
|
9 the Free Software Foundation; either version 2, or (at your option) |
314 | 10 any later version. |
11 | |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14125
diff
changeset
|
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14125
diff
changeset
|
20 Boston, MA 02111-1307, USA. */ |
314 | 21 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
22 #include <config.h> |
314 | 23 #include <signal.h> |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7814
diff
changeset
|
24 #include <stdio.h> |
314 | 25 #include <ctype.h> |
26 | |
21514 | 27 #ifdef HAVE_UNISTD_H |
28 #include <unistd.h> | |
29 #endif | |
30 | |
3525
58e789baa27a
Include lisp.h earlier (before termhooks.h).
Richard M. Stallman <rms@gnu.org>
parents:
3517
diff
changeset
|
31 #include "lisp.h" |
314 | 32 #include "termchar.h" |
33 #include "termopts.h" | |
13526
34382f4e23cb
Always include dispextern.h before cm.h.
Richard M. Stallman <rms@gnu.org>
parents:
13448
diff
changeset
|
34 /* 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
|
35 #include "dispextern.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
36 #include "cm.h" |
314 | 37 #include "buffer.h" |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
38 #include "charset.h" |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
39 #include "keyboard.h" |
764 | 40 #include "frame.h" |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
41 #include "termhooks.h" |
314 | 42 #include "window.h" |
43 #include "commands.h" | |
44 #include "disptab.h" | |
45 #include "indent.h" | |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
46 #include "intervals.h" |
15065 | 47 #include "blockinput.h" |
21514 | 48 #include "process.h" |
314 | 49 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
50 /* I don't know why DEC Alpha OSF1 fail to compile this file if we |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
51 include the following file. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
52 /* #include "systty.h" */ |
12917 | 53 #include "syssignal.h" |
554 | 54 |
314 | 55 #ifdef HAVE_X_WINDOWS |
56 #include "xterm.h" | |
25012 | 57 #endif /* HAVE_X_WINDOWS */ |
314 | 58 |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
59 #ifdef HAVE_NTGUI |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
60 #include "w32term.h" |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
61 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
62 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
63 #ifdef MAC_OS |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
64 #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
|
65 #endif /* MAC_OS */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
66 |
25012 | 67 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ |
68 | |
7808
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
69 #include "systime.h" |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
70 #include <errno.h> |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
71 |
25012 | 72 /* To get the prototype for `sleep'. */ |
73 | |
74 #ifdef HAVE_UNISTD_H | |
75 #include <unistd.h> | |
76 #endif | |
77 | |
314 | 78 /* Get number of chars of output now in the buffer of a stdio stream. |
25012 | 79 This ought to be built in in stdio, but it isn't. Some s- files |
80 override this because their stdio internals differ. */ | |
81 | |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
82 #ifdef __GNU_LIBRARY__ |
25012 | 83 |
84 /* The s- file might have overridden the definition with one that | |
85 works for the system's C library. But we are using the GNU C | |
86 library, so this is the right definition for every system. */ | |
87 | |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
88 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
89 #define PENDING_OUTPUT_COUNT GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
90 #else |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
91 #undef PENDING_OUTPUT_COUNT |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
92 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__bufp - (FILE)->__buffer) |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
93 #endif |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
94 #else /* not __GNU_LIBRARY__ */ |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
95 #if !defined (PENDING_OUTPUT_COUNT) && HAVE_STDIO_EXT_H && HAVE___FPENDING |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
96 #include <stdio_ext.h> |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
97 #define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE) |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25781
diff
changeset
|
98 #endif |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
99 #ifndef PENDING_OUTPUT_COUNT |
314 | 100 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) |
101 #endif | |
25012 | 102 #endif /* not __GNU_LIBRARY__ */ |
103 | |
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
104 #if defined(HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) |
29437 | 105 #include <term.h> /* for tgetent */ |
106 #endif | |
25012 | 107 |
108 /* Structure to pass dimensions around. Used for character bounding | |
109 boxes, glyph matrix dimensions and alike. */ | |
110 | |
111 struct dim | |
112 { | |
113 int width; | |
114 int height; | |
115 }; | |
116 | |
117 | |
118 /* Function prototypes. */ | |
119 | |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
120 static struct glyph_matrix *save_current_matrix P_ ((struct frame *)); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
121 static void restore_current_matrix P_ ((struct frame *, struct glyph_matrix *)); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
122 static void fake_current_matrices P_ ((Lisp_Object)); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
123 static void redraw_overlapping_rows P_ ((struct window *, int)); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
124 static void redraw_overlapped_rows P_ ((struct window *, int)); |
25012 | 125 static int count_blanks P_ ((struct glyph *, int)); |
126 static int count_match P_ ((struct glyph *, struct glyph *, | |
127 struct glyph *, struct glyph *)); | |
128 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int)); | |
129 static void update_frame_line P_ ((struct frame *, int)); | |
130 static struct dim allocate_matrices_for_frame_redisplay | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
131 P_ ((Lisp_Object, int, int, int, int *)); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
132 static void allocate_matrices_for_window_redisplay P_ ((struct window *)); |
25012 | 133 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim)); |
134 static void adjust_frame_glyphs P_ ((struct frame *)); | |
135 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *)); | |
136 static void free_glyph_matrix P_ ((struct glyph_matrix *)); | |
137 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *, | |
138 int, int, struct dim)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
139 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); |
25012 | 140 static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *)); |
34895
53e52b3525bf
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34893
diff
changeset
|
141 #if GLYPH_DEBUG |
25012 | 142 static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *)); |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
143 #endif |
25012 | 144 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); |
145 static void build_frame_matrix_from_window_tree P_ ((struct glyph_matrix *, | |
146 struct window *)); | |
147 static void build_frame_matrix_from_leaf_window P_ ((struct glyph_matrix *, | |
148 struct window *)); | |
149 static struct glyph_pool *new_glyph_pool P_ ((void)); | |
150 static void free_glyph_pool P_ ((struct glyph_pool *)); | |
151 static void adjust_frame_glyphs_initially P_ ((void)); | |
152 static void adjust_frame_message_buffer P_ ((struct frame *)); | |
153 static void adjust_decode_mode_spec_buffer P_ ((struct frame *)); | |
154 static void fill_up_glyph_row_with_spaces P_ ((struct glyph_row *)); | |
155 static void build_frame_matrix P_ ((struct frame *)); | |
156 void clear_current_matrices P_ ((struct frame *)); | |
157 void scroll_glyph_matrix_range P_ ((struct glyph_matrix *, int, int, | |
158 int, int)); | |
159 static void clear_window_matrices P_ ((struct window *, int)); | |
160 static void fill_up_glyph_row_area_with_spaces P_ ((struct glyph_row *, int)); | |
161 static int scrolling_window P_ ((struct window *, int)); | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
162 static int update_window_line P_ ((struct window *, int, int *)); |
25012 | 163 static void update_marginal_area P_ ((struct window *, int, int)); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
164 static int update_text_area P_ ((struct window *, int)); |
25012 | 165 static void make_current P_ ((struct glyph_matrix *, struct glyph_matrix *, |
166 int)); | |
167 static void mirror_make_current P_ ((struct window *, int)); | |
168 void check_window_matrix_pointers P_ ((struct window *)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
169 #if GLYPH_DEBUG |
25012 | 170 static void check_matrix_pointers P_ ((struct glyph_matrix *, |
171 struct glyph_matrix *)); | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
172 #endif |
25012 | 173 static void mirror_line_dance P_ ((struct window *, int, int, int *, char *)); |
174 static int update_window_tree P_ ((struct window *, int)); | |
175 static int update_window P_ ((struct window *, int)); | |
176 static int update_frame_1 P_ ((struct frame *, int, int)); | |
177 static void set_window_cursor_after_update P_ ((struct window *)); | |
178 static int row_equal_p P_ ((struct window *, struct glyph_row *, | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
179 struct glyph_row *, int)); |
25012 | 180 static void adjust_frame_glyphs_for_window_redisplay P_ ((struct frame *)); |
181 static void adjust_frame_glyphs_for_frame_redisplay P_ ((struct frame *)); | |
182 static void reverse_rows P_ ((struct glyph_matrix *, int, int)); | |
183 static int margin_glyphs_to_reserve P_ ((struct window *, int, Lisp_Object)); | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
184 static void sync_window_with_frame_matrix_rows P_ ((struct window *)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
185 struct window *frame_row_to_window P_ ((struct window *, int)); |
25012 | 186 |
187 | |
188 /* Non-zero means don't pause redisplay for pending input. (This is | |
189 for debugging and for a future implementation of EDT-like | |
190 scrolling. */ | |
191 | |
192 int redisplay_dont_pause; | |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
193 |
554 | 194 /* Nonzero upon entry to redisplay means do not assume anything about |
764 | 195 current contents of actual terminal frame; clear and redraw it. */ |
314 | 196 |
764 | 197 int frame_garbaged; |
314 | 198 |
25012 | 199 /* Nonzero means last display completed. Zero means it was preempted. */ |
314 | 200 |
201 int display_completed; | |
202 | |
25012 | 203 /* Lisp variable visible-bell; enables use of screen-flash instead of |
204 audible bell. */ | |
314 | 205 |
206 int visible_bell; | |
207 | |
764 | 208 /* Invert the color of the whole frame, at a low level. */ |
314 | 209 |
210 int inverse_video; | |
211 | |
212 /* Line speed of the terminal. */ | |
213 | |
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
|
214 EMACS_INT baud_rate; |
314 | 215 |
25012 | 216 /* Either nil or a symbol naming the window system under which Emacs |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
217 creates the first frame. */ |
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
218 |
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
219 Lisp_Object Vinitial_window_system; |
314 | 220 |
221 /* Version number of X windows: 10, 11 or nil. */ | |
25012 | 222 |
314 | 223 Lisp_Object Vwindow_system_version; |
224 | |
25012 | 225 /* Vector of glyph definitions. Indexed by glyph number, the contents |
226 are a string which is how to output the glyph. | |
314 | 227 |
228 If Vglyph_table is nil, a glyph is output by using its low 8 bits | |
25012 | 229 as a character code. |
230 | |
231 This is an obsolete feature that is no longer used. The variable | |
232 is retained for compatibility. */ | |
314 | 233 |
234 Lisp_Object Vglyph_table; | |
235 | |
236 /* Display table to use for vectors that don't specify their own. */ | |
237 | |
238 Lisp_Object Vstandard_display_table; | |
239 | |
25012 | 240 /* Nonzero means reading single-character input with prompt so put |
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
|
241 cursor on mini-buffer after the prompt. Positive means at end of |
25012 | 242 text in echo area; negative means at beginning of line. */ |
243 | |
314 | 244 int cursor_in_echo_area; |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
245 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
246 Lisp_Object Qdisplay_table, Qredisplay_dont_pause; |
25012 | 247 |
314 | 248 |
25012 | 249 /* The currently selected frame. In a single-frame version, this |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
250 variable always equals the_only_frame. */ |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
251 |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
252 Lisp_Object selected_frame; |
25012 | 253 |
254 /* A frame which is not just a mini-buffer, or 0 if there are no such | |
764 | 255 frames. This is usually the most recent such frame that was |
9572 | 256 selected. In a single-frame version, this variable always holds |
257 the address of the_only_frame. */ | |
25012 | 258 |
259 struct frame *last_nonminibuf_frame; | |
260 | |
261 /* 1 means SIGWINCH happened when not safe. */ | |
262 | |
263 int delayed_size_change; | |
264 | |
265 /* 1 means glyph initialization has been completed at startup. */ | |
266 | |
267 static int glyphs_initialized_initially_p; | |
268 | |
269 /* Updated window if != 0. Set by update_window. */ | |
270 | |
271 struct window *updated_window; | |
272 | |
273 /* Glyph row updated in update_window_line, and area that is updated. */ | |
274 | |
275 struct glyph_row *updated_row; | |
276 int updated_area; | |
277 | |
278 /* A glyph for a space. */ | |
279 | |
280 struct glyph space_glyph; | |
281 | |
282 /* Non-zero means update has been performed directly, so that there's | |
283 no need for redisplay_internal to do much work. Set by | |
284 direct_output_for_insert. */ | |
285 | |
286 int redisplay_performed_directly_p; | |
287 | |
288 /* Counts of allocated structures. These counts serve to diagnose | |
289 memory leaks and double frees. */ | |
290 | |
291 int glyph_matrix_count; | |
292 int glyph_pool_count; | |
293 | |
294 /* If non-null, the frame whose frame matrices are manipulated. If | |
295 null, window matrices are worked on. */ | |
296 | |
297 static struct frame *frame_matrix_frame; | |
298 | |
299 /* Non-zero means that fonts have been loaded since the last glyph | |
300 matrix adjustments. Redisplay must stop, and glyph matrices must | |
301 be adjusted when this flag becomes non-zero during display. The | |
302 reason fonts can be loaded so late is that fonts of fontsets are | |
303 loaded on demand. */ | |
304 | |
305 int fonts_changed_p; | |
306 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
307 /* Convert vpos and hpos from frame to window and vice versa. |
25012 | 308 This may only be used for terminal frames. */ |
309 | |
310 #if GLYPH_DEBUG | |
311 | |
312 static int window_to_frame_vpos P_ ((struct window *, int)); | |
313 static int window_to_frame_hpos P_ ((struct window *, int)); | |
314 #define WINDOW_TO_FRAME_VPOS(W, VPOS) window_to_frame_vpos ((W), (VPOS)) | |
315 #define WINDOW_TO_FRAME_HPOS(W, HPOS) window_to_frame_hpos ((W), (HPOS)) | |
316 | |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
317 /* 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
|
318 information. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
319 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
320 struct redisplay_history |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
321 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
322 char trace[512 + 100]; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
323 }; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
324 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
325 /* The size of the history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
326 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
327 #define REDISPLAY_HISTORY_SIZE 30 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
328 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
329 /* The redisplay history buffer. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
330 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
331 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
|
332 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
333 /* Next free entry in redisplay_history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
334 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
335 static int history_idx; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
336 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
337 /* 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
|
338 history. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
339 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
340 static unsigned history_tick; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
341 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
342 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
|
343 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
|
344 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
345 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
346 /* 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
|
347 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
|
348 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
|
349 has been interrupted for pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
350 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
351 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
352 add_window_display_history (w, msg, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
353 struct window *w; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
354 char *msg; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
355 int paused_p; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
356 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
357 char *buf; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
358 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
359 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
360 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
361 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
362 ++history_idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
363 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
364 sprintf (buf, "%d: window %p (`%s')%s\n", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
365 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
366 w, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
367 ((BUFFERP (w->buffer) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
368 && 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
|
369 ? (char *) SDATA (XBUFFER (w->buffer)->name) |
34866
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 paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
372 strcat (buf, msg); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
373 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
374 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
375 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
376 /* 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
|
377 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
|
378 pending input. */ |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
379 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
380 static void |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
381 add_frame_display_history (f, paused_p) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
382 struct frame *f; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
383 int paused_p; |
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 char *buf; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
386 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
387 if (history_idx >= REDISPLAY_HISTORY_SIZE) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
388 history_idx = 0; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
389 buf = redisplay_history[history_idx].trace; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
390 ++history_idx; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
391 |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
392 sprintf (buf, "%d: update frame %p%s", |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
393 history_tick++, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
394 f, paused_p ? " ***paused***" : ""); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
395 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
396 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
397 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
398 DEFUN ("dump-redisplay-history", Fdump_redisplay_history, |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
399 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
|
400 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
|
401 () |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
402 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
403 int i; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
404 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
405 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
|
406 { |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
407 if (i < 0) |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
408 i = REDISPLAY_HISTORY_SIZE - 1; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
409 fprintf (stderr, "%s\n", redisplay_history[i].trace); |
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 return Qnil; |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
413 } |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
414 |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
415 |
25012 | 416 #else /* GLYPH_DEBUG == 0 */ |
417 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
418 #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
|
419 #define WINDOW_TO_FRAME_HPOS(W, HPOS) ((HPOS) + WINDOW_LEFT_EDGE_COL (W)) |
25012 | 420 |
421 #endif /* GLYPH_DEBUG == 0 */ | |
422 | |
423 | |
424 /* Like bcopy except never gets confused by overlap. Let this be the | |
425 first function defined in this file, or change emacs.c where the | |
426 address of this function is used. */ | |
314 | 427 |
428 void | |
429 safe_bcopy (from, to, size) | |
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
430 const char *from; |
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
431 char *to; |
314 | 432 int size; |
433 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
434 if (size <= 0 || from == to) |
314 | 435 return; |
436 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
437 /* 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
|
438 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
|
439 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
|
440 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
|
441 bcopy (from, to, size); |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
442 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
443 /* 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
|
444 else |
314 | 445 { |
46551
227785e3e29f
(safe_bcopy): Source pointer now points to const.
Ken Raeburn <raeburn@raeburn.org>
parents:
46370
diff
changeset
|
446 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
|
447 register char *endt = to + size; |
314 | 448 |
449 /* If TO - FROM is large, then we should break the copy into | |
450 nonoverlapping chunks of TO - FROM bytes each. However, if | |
451 TO - FROM is small, then the bcopy function call overhead | |
452 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
|
453 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
|
454 bad, I'm trying to err in its favor. */ |
314 | 455 if (to - from < 64) |
456 { | |
457 do | |
458 *--endt = *--endf; | |
459 while (endf != from); | |
460 } | |
461 else | |
462 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
463 for (;;) |
314 | 464 { |
465 endt -= (to - from); | |
466 endf -= (to - from); | |
467 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
468 if (endt < to) |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
469 break; |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
470 |
314 | 471 bcopy (endf, endt, to - from); |
472 } | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
473 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
474 /* If SIZE wasn't a multiple of TO - FROM, there will be a |
25012 | 475 little left over. The amount left over is (endt + (to - |
476 from)) - to, which is endt - from. */ | |
314 | 477 bcopy (from, to, endt - from); |
478 } | |
479 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
480 } |
314 | 481 |
25012 | 482 |
483 | |
484 /*********************************************************************** | |
485 Glyph Matrices | |
486 ***********************************************************************/ | |
487 | |
488 /* Allocate and return a glyph_matrix structure. POOL is the glyph | |
489 pool from which memory for the matrix should be allocated, or null | |
490 for window-based redisplay where no glyph pools are used. The | |
491 member `pool' of the glyph matrix structure returned is set to | |
492 POOL, the structure is otherwise zeroed. */ | |
493 | |
494 struct glyph_matrix * | |
495 new_glyph_matrix (pool) | |
496 struct glyph_pool *pool; | |
497 { | |
498 struct glyph_matrix *result; | |
499 | |
500 /* Allocate and clear. */ | |
501 result = (struct glyph_matrix *) xmalloc (sizeof *result); | |
502 bzero (result, sizeof *result); | |
503 | |
504 /* Increment number of allocated matrices. This count is used | |
505 to detect memory leaks. */ | |
506 ++glyph_matrix_count; | |
507 | |
508 /* Set pool and return. */ | |
509 result->pool = pool; | |
510 return result; | |
511 } | |
512 | |
513 | |
514 /* Free glyph matrix MATRIX. Passing in a null MATRIX is allowed. | |
515 | |
516 The global counter glyph_matrix_count is decremented when a matrix | |
517 is freed. If the count gets negative, more structures were freed | |
518 than allocated, i.e. one matrix was freed more than once or a bogus | |
519 pointer was passed to this function. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
520 |
25012 | 521 If MATRIX->pool is null, this means that the matrix manages its own |
522 glyph memory---this is done for matrices on X frames. Freeing the | |
523 matrix also frees the glyph memory in this case. */ | |
524 | |
525 static void | |
526 free_glyph_matrix (matrix) | |
527 struct glyph_matrix *matrix; | |
528 { | |
529 if (matrix) | |
530 { | |
531 int i; | |
532 | |
533 /* Detect the case that more matrices are freed than were | |
534 allocated. */ | |
535 if (--glyph_matrix_count < 0) | |
536 abort (); | |
537 | |
538 /* Free glyph memory if MATRIX owns it. */ | |
539 if (matrix->pool == NULL) | |
540 for (i = 0; i < matrix->rows_allocated; ++i) | |
541 xfree (matrix->rows[i].glyphs[LEFT_MARGIN_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
542 |
25012 | 543 /* Free row structures and the matrix itself. */ |
544 xfree (matrix->rows); | |
545 xfree (matrix); | |
546 } | |
547 } | |
548 | |
549 | |
550 /* Return the number of glyphs to reserve for a marginal area of | |
551 window W. TOTAL_GLYPHS is the number of glyphs in a complete | |
552 display line of window W. MARGIN gives the width of the marginal | |
553 area in canonical character units. MARGIN should be an integer | |
554 or a float. */ | |
555 | |
556 static int | |
557 margin_glyphs_to_reserve (w, total_glyphs, margin) | |
558 struct window *w; | |
559 int total_glyphs; | |
560 Lisp_Object margin; | |
561 { | |
562 int n; | |
563 | |
564 if (NUMBERP (margin)) | |
565 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
566 int width = XFASTINT (w->total_cols); |
25012 | 567 double d = max (0, XFLOATINT (margin)); |
568 d = min (width / 2 - 1, d); | |
569 n = (int) ((double) total_glyphs / width * d); | |
570 } | |
571 else | |
572 n = 0; | |
573 | |
574 return n; | |
575 } | |
576 | |
577 | |
578 /* Adjust glyph matrix MATRIX on window W or on a frame to changed | |
579 window sizes. | |
580 | |
581 W is null if the function is called for a frame glyph matrix. | |
582 Otherwise it is the window MATRIX is a member of. X and Y are the | |
583 indices of the first column and row of MATRIX within the frame | |
584 matrix, if such a matrix exists. They are zero for purely | |
585 window-based redisplay. DIM is the needed size of the matrix. | |
586 | |
587 In window-based redisplay, where no frame matrices exist, glyph | |
588 matrices manage their own glyph storage. Otherwise, they allocate | |
589 storage from a common frame glyph pool which can be found in | |
590 MATRIX->pool. | |
591 | |
592 The reason for this memory management strategy is to avoid complete | |
593 frame redraws if possible. When we allocate from a common pool, a | |
594 change of the location or size of a sub-matrix within the pool | |
595 requires a complete redisplay of the frame because we cannot easily | |
596 make sure that the current matrices of all windows still agree with | |
597 what is displayed on the screen. While this is usually fast, it | |
598 leads to screen flickering. */ | |
599 | |
600 static void | |
601 adjust_glyph_matrix (w, matrix, x, y, dim) | |
602 struct window *w; | |
603 struct glyph_matrix *matrix; | |
604 int x, y; | |
605 struct dim dim; | |
606 { | |
607 int i; | |
608 int new_rows; | |
609 int marginal_areas_changed_p = 0; | |
25546 | 610 int header_line_changed_p = 0; |
611 int header_line_p = 0; | |
25012 | 612 int left = -1, right = -1; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
613 int window_width = -1, window_height; |
25012 | 614 |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
615 /* 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
|
616 Get W's size. */ |
25012 | 617 if (w) |
618 { | |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
619 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
|
620 |
25546 | 621 header_line_p = WINDOW_WANTS_HEADER_LINE_P (w); |
622 header_line_changed_p = header_line_p != matrix->header_line_p; | |
25012 | 623 } |
25546 | 624 matrix->header_line_p = header_line_p; |
25012 | 625 |
52377
a90dea69e764
(adjust_glyph_matrix): Call window_box whenever W is nonzero.
Richard M. Stallman <rms@gnu.org>
parents:
51413
diff
changeset
|
626 /* 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
|
627 Do nothing if MATRIX' size, position, vscroll, and marginal areas |
25012 | 628 haven't changed. This optimization is important because preserving |
629 the matrix means preventing redisplay. */ | |
630 if (matrix->pool == NULL) | |
631 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
632 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
|
633 right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols); |
25012 | 634 xassert (left >= 0 && right >= 0); |
635 marginal_areas_changed_p = (left != matrix->left_margin_glyphs | |
636 || right != matrix->right_margin_glyphs); | |
637 | |
638 if (!marginal_areas_changed_p | |
639 && !fonts_changed_p | |
25546 | 640 && !header_line_changed_p |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
641 && 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
|
642 && matrix->window_top_line == WINDOW_TOP_EDGE_LINE (w) |
25012 | 643 && matrix->window_height == window_height |
644 && matrix->window_vscroll == w->vscroll | |
645 && matrix->window_width == window_width) | |
646 return; | |
647 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
648 |
25012 | 649 /* Enlarge MATRIX->rows if necessary. New rows are cleared. */ |
650 if (matrix->rows_allocated < dim.height) | |
651 { | |
652 int size = dim.height * sizeof (struct glyph_row); | |
653 new_rows = dim.height - matrix->rows_allocated; | |
654 matrix->rows = (struct glyph_row *) xrealloc (matrix->rows, size); | |
655 bzero (matrix->rows + matrix->rows_allocated, | |
656 new_rows * sizeof *matrix->rows); | |
657 matrix->rows_allocated = dim.height; | |
658 } | |
659 else | |
660 new_rows = 0; | |
661 | |
662 /* If POOL is not null, MATRIX is a frame matrix or a window matrix | |
663 on a frame not using window-based redisplay. Set up pointers for | |
664 each row into the glyph pool. */ | |
665 if (matrix->pool) | |
666 { | |
667 xassert (matrix->pool->glyphs); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
668 |
25012 | 669 if (w) |
670 { | |
671 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
|
672 w->left_margin_cols); |
25012 | 673 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
|
674 w->right_margin_cols); |
25012 | 675 } |
676 else | |
677 left = right = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
678 |
25012 | 679 for (i = 0; i < dim.height; ++i) |
680 { | |
681 struct glyph_row *row = &matrix->rows[i]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
682 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
683 row->glyphs[LEFT_MARGIN_AREA] |
25012 | 684 = (matrix->pool->glyphs |
685 + (y + i) * matrix->pool->ncolumns | |
686 + x); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
687 |
25012 | 688 if (w == NULL |
689 || row == matrix->rows + dim.height - 1 | |
25546 | 690 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 691 { |
692 row->glyphs[TEXT_AREA] | |
693 = row->glyphs[LEFT_MARGIN_AREA]; | |
694 row->glyphs[RIGHT_MARGIN_AREA] | |
695 = row->glyphs[TEXT_AREA] + dim.width; | |
696 row->glyphs[LAST_AREA] | |
697 = row->glyphs[RIGHT_MARGIN_AREA]; | |
698 } | |
699 else | |
700 { | |
701 row->glyphs[TEXT_AREA] | |
702 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
703 row->glyphs[RIGHT_MARGIN_AREA] | |
704 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
705 row->glyphs[LAST_AREA] | |
706 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
707 } | |
708 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
709 |
25012 | 710 matrix->left_margin_glyphs = left; |
711 matrix->right_margin_glyphs = right; | |
712 } | |
713 else | |
714 { | |
715 /* 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
|
716 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
|
717 Allocate glyph memory from the heap. */ |
25012 | 718 if (dim.width > matrix->matrix_w |
719 || new_rows | |
25546 | 720 || header_line_changed_p |
25012 | 721 || marginal_areas_changed_p) |
722 { | |
723 struct glyph_row *row = matrix->rows; | |
724 struct glyph_row *end = row + matrix->rows_allocated; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
725 |
25012 | 726 while (row < end) |
727 { | |
728 row->glyphs[LEFT_MARGIN_AREA] | |
729 = (struct glyph *) xrealloc (row->glyphs[LEFT_MARGIN_AREA], | |
730 (dim.width | |
731 * sizeof (struct glyph))); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
732 |
25012 | 733 /* The mode line never has marginal areas. */ |
734 if (row == matrix->rows + dim.height - 1 | |
25546 | 735 || (row == matrix->rows && matrix->header_line_p)) |
25012 | 736 { |
737 row->glyphs[TEXT_AREA] | |
738 = row->glyphs[LEFT_MARGIN_AREA]; | |
739 row->glyphs[RIGHT_MARGIN_AREA] | |
740 = row->glyphs[TEXT_AREA] + dim.width; | |
741 row->glyphs[LAST_AREA] | |
742 = row->glyphs[RIGHT_MARGIN_AREA]; | |
743 } | |
744 else | |
745 { | |
746 row->glyphs[TEXT_AREA] | |
747 = row->glyphs[LEFT_MARGIN_AREA] + left; | |
748 row->glyphs[RIGHT_MARGIN_AREA] | |
749 = row->glyphs[TEXT_AREA] + dim.width - left - right; | |
750 row->glyphs[LAST_AREA] | |
751 = row->glyphs[LEFT_MARGIN_AREA] + dim.width; | |
752 } | |
753 ++row; | |
754 } | |
755 } | |
756 | |
757 xassert (left >= 0 && right >= 0); | |
758 matrix->left_margin_glyphs = left; | |
759 matrix->right_margin_glyphs = right; | |
760 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
761 |
25012 | 762 /* Number of rows to be used by MATRIX. */ |
763 matrix->nrows = dim.height; | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
764 xassert (matrix->nrows >= 0); |
25012 | 765 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
766 if (w) |
25012 | 767 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
768 if (matrix == w->current_matrix) |
25012 | 769 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
770 /* 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
|
771 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
|
772 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
|
773 building desired matrices when this function runs. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
774 if (window_width < 0) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
775 window_width = window_box_width (w, -1); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
776 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
777 /* 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
|
778 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
|
779 of the window. */ |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
780 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
|
781 && !header_line_changed_p |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
782 && new_rows == 0 |
e293840c7332
(adjust_glyph_matrix): Don't try to reuse the current
Gerd Moellmann <gerd@gnu.org>
parents:
36697
diff
changeset
|
783 && dim.width == matrix->matrix_w |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
784 && 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
|
785 && 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
|
786 && matrix->window_width == window_width) |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
787 { |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
788 /* Find the last row in the window. */ |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
789 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
|
790 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
|
791 { |
38748
bb32ae33769e
(adjust_glyph_matrix): Undo last change.
Gerd Moellmann <gerd@gnu.org>
parents:
38734
diff
changeset
|
792 ++i; |
38528
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
793 break; |
c867615c6a26
(adjust_glyph_matrix): In the optimization for
Gerd Moellmann <gerd@gnu.org>
parents:
38489
diff
changeset
|
794 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
795 |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
796 /* 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
|
797 are invalidated below. */ |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
798 if (INTEGERP (w->window_end_vpos) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
799 && XFASTINT (w->window_end_vpos) >= i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
800 w->window_end_valid = Qnil; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
801 |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
802 while (i < matrix->nrows) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
803 matrix->rows[i++].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
804 } |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
805 else |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
806 { |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
807 for (i = 0; i < matrix->nrows; ++i) |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
808 matrix->rows[i].enabled_p = 0; |
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
809 } |
25012 | 810 } |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
811 else if (matrix == w->desired_matrix) |
25012 | 812 { |
35609
83f1f7fbe26e
(adjust_glyph_matrix): Always clear desired matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
35445
diff
changeset
|
813 /* 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
|
814 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
|
815 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
|
816 redisplays. */ |
25012 | 817 for (i = 0; i < matrix->nrows; ++i) |
818 matrix->rows[i].enabled_p = 0; | |
819 } | |
820 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
821 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
822 |
25012 | 823 /* Remember last values to be able to optimize frame redraws. */ |
824 matrix->matrix_x = x; | |
825 matrix->matrix_y = y; | |
826 matrix->matrix_w = dim.width; | |
827 matrix->matrix_h = dim.height; | |
828 | |
829 /* Record the top y location and height of W at the time the matrix | |
830 was last adjusted. This is used to optimize redisplay above. */ | |
831 if (w) | |
832 { | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
833 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
|
834 matrix->window_top_line = WINDOW_TOP_EDGE_LINE (w); |
25012 | 835 matrix->window_height = window_height; |
836 matrix->window_width = window_width; | |
837 matrix->window_vscroll = w->vscroll; | |
838 } | |
839 } | |
840 | |
841 | |
842 /* Reverse the contents of rows in MATRIX between START and END. The | |
843 contents of the row at END - 1 end up at START, END - 2 at START + | |
844 1 etc. This is part of the implementation of rotate_matrix (see | |
845 below). */ | |
314 | 846 |
847 static void | |
25012 | 848 reverse_rows (matrix, start, end) |
849 struct glyph_matrix *matrix; | |
850 int start, end; | |
314 | 851 { |
25012 | 852 int i, j; |
853 | |
854 for (i = start, j = end - 1; i < j; ++i, --j) | |
855 { | |
856 /* Non-ISO HP/UX compiler doesn't like auto struct | |
857 initialization. */ | |
858 struct glyph_row temp; | |
859 temp = matrix->rows[i]; | |
860 matrix->rows[i] = matrix->rows[j]; | |
861 matrix->rows[j] = temp; | |
862 } | |
314 | 863 } |
864 | |
25012 | 865 |
866 /* Rotate the contents of rows in MATRIX in the range FIRST .. LAST - | |
867 1 by BY positions. BY < 0 means rotate left, i.e. towards lower | |
868 indices. (Note: this does not copy glyphs, only glyph pointers in | |
869 row structures are moved around). | |
870 | |
871 The algorithm used for rotating the vector was, I believe, first | |
872 described by Kernighan. See the vector R as consisting of two | |
873 sub-vectors AB, where A has length BY for BY >= 0. The result | |
874 after rotating is then BA. Reverse both sub-vectors to get ArBr | |
875 and reverse the result to get (ArBr)r which is BA. Similar for | |
876 rotating right. */ | |
877 | |
878 void | |
879 rotate_matrix (matrix, first, last, by) | |
880 struct glyph_matrix *matrix; | |
881 int first, last, by; | |
314 | 882 { |
25012 | 883 if (by < 0) |
884 { | |
885 /* Up (rotate left, i.e. towards lower indices). */ | |
886 by = -by; | |
887 reverse_rows (matrix, first, first + by); | |
888 reverse_rows (matrix, first + by, last); | |
889 reverse_rows (matrix, first, last); | |
890 } | |
891 else if (by > 0) | |
314 | 892 { |
25012 | 893 /* Down (rotate right, i.e. towards higher indices). */ |
894 reverse_rows (matrix, last - by, last); | |
895 reverse_rows (matrix, first, last - by); | |
896 reverse_rows (matrix, first, last); | |
314 | 897 } |
25012 | 898 } |
899 | |
900 | |
901 /* Increment buffer positions in glyph rows of MATRIX. Do it for rows | |
902 with indices START <= index < END. Increment positions by DELTA/ | |
903 DELTA_BYTES. */ | |
904 | |
905 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
906 increment_matrix_positions (matrix, start, end, delta, delta_bytes) |
25012 | 907 struct glyph_matrix *matrix; |
908 int start, end, delta, delta_bytes; | |
909 { | |
910 /* Check that START and END are reasonable values. */ | |
911 xassert (start >= 0 && start <= matrix->nrows); | |
912 xassert (end >= 0 && end <= matrix->nrows); | |
913 xassert (start <= end); | |
914 | |
915 for (; start < end; ++start) | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
916 increment_row_positions (matrix->rows + start, delta, delta_bytes); |
25012 | 917 } |
918 | |
919 | |
920 /* Enable a range of rows in glyph matrix MATRIX. START and END are | |
921 the row indices of the first and last + 1 row to enable. If | |
922 ENABLED_P is non-zero, enabled_p flags in rows will be set to 1. */ | |
923 | |
924 void | |
925 enable_glyph_matrix_rows (matrix, start, end, enabled_p) | |
926 struct glyph_matrix *matrix; | |
927 int start, end; | |
928 int enabled_p; | |
929 { | |
31932
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
930 xassert (start <= end); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
931 xassert (start >= 0 && start < matrix->nrows); |
081edde76197
(adjust_glyph_matrix, enable_glyph_matrix_rows):
Gerd Moellmann <gerd@gnu.org>
parents:
31850
diff
changeset
|
932 xassert (end >= 0 && end <= matrix->nrows); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
933 |
25012 | 934 for (; start < end; ++start) |
935 matrix->rows[start].enabled_p = enabled_p != 0; | |
936 } | |
937 | |
938 | |
939 /* Clear MATRIX. | |
940 | |
941 This empties all rows in MATRIX by setting the enabled_p flag for | |
942 all rows of the matrix to zero. The function prepare_desired_row | |
943 will eventually really clear a row when it sees one with a zero | |
944 enabled_p flag. | |
945 | |
946 Resets update hints to defaults value. The only update hint | |
947 currently present is the flag MATRIX->no_scrolling_p. */ | |
948 | |
949 void | |
950 clear_glyph_matrix (matrix) | |
951 struct glyph_matrix *matrix; | |
952 { | |
953 if (matrix) | |
314 | 954 { |
25012 | 955 enable_glyph_matrix_rows (matrix, 0, matrix->nrows, 0); |
956 matrix->no_scrolling_p = 0; | |
314 | 957 } |
958 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
959 |
25012 | 960 |
961 /* Shift part of the glyph matrix MATRIX of window W up or down. | |
962 Increment y-positions in glyph rows between START and END by DY, | |
963 and recompute their visible height. */ | |
964 | |
965 void | |
966 shift_glyph_matrix (w, matrix, start, end, dy) | |
967 struct window *w; | |
968 struct glyph_matrix *matrix; | |
969 int start, end, dy; | |
970 { | |
971 int min_y, max_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
972 |
25012 | 973 xassert (start <= end); |
974 xassert (start >= 0 && start < matrix->nrows); | |
975 xassert (end >= 0 && end <= matrix->nrows); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
976 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
977 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
|
978 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
979 |
25012 | 980 for (; start < end; ++start) |
981 { | |
982 struct glyph_row *row = &matrix->rows[start]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
983 |
25012 | 984 row->y += dy; |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
985 row->visible_height = row->height; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
986 |
25012 | 987 if (row->y < min_y) |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
988 row->visible_height -= min_y - row->y; |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
989 if (row->y + row->height > max_y) |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
990 row->visible_height -= row->y + row->height - max_y; |
25012 | 991 } |
992 } | |
993 | |
994 | |
995 /* Mark all rows in current matrices of frame F as invalid. Marking | |
996 invalid is done by setting enabled_p to zero for all rows in a | |
997 current matrix. */ | |
998 | |
999 void | |
1000 clear_current_matrices (f) | |
1001 register struct frame *f; | |
1002 { | |
1003 /* Clear frame current matrix, if we have one. */ | |
1004 if (f->current_matrix) | |
1005 clear_glyph_matrix (f->current_matrix); | |
1006 | |
1007 /* Clear the matrix of the menu bar window, if such a window exists. | |
1008 The menu bar window is currently used to display menus on X when | |
1009 no toolkit support is compiled in. */ | |
1010 if (WINDOWP (f->menu_bar_window)) | |
1011 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix); | |
1012 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1013 /* 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
|
1014 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
|
1015 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix); |
25012 | 1016 |
1017 /* Clear current window matrices. */ | |
1018 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1019 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 0); | |
1020 } | |
1021 | |
1022 | |
1023 /* Clear out all display lines of F for a coming redisplay. */ | |
314 | 1024 |
21514 | 1025 void |
25012 | 1026 clear_desired_matrices (f) |
1027 register struct frame *f; | |
314 | 1028 { |
25012 | 1029 if (f->desired_matrix) |
1030 clear_glyph_matrix (f->desired_matrix); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1031 |
25012 | 1032 if (WINDOWP (f->menu_bar_window)) |
1033 clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix); | |
1034 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
1035 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
|
1036 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix); |
25012 | 1037 |
1038 /* Do it for window matrices. */ | |
1039 xassert (WINDOWP (FRAME_ROOT_WINDOW (f))); | |
1040 clear_window_matrices (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
1041 } | |
1042 | |
1043 | |
1044 /* Clear matrices in window tree rooted in W. If DESIRED_P is | |
1045 non-zero clear desired matrices, otherwise clear current matrices. */ | |
1046 | |
1047 static void | |
1048 clear_window_matrices (w, desired_p) | |
1049 struct window *w; | |
1050 int desired_p; | |
1051 { | |
1052 while (w) | |
314 | 1053 { |
25012 | 1054 if (!NILP (w->hchild)) |
1055 { | |
1056 xassert (WINDOWP (w->hchild)); | |
1057 clear_window_matrices (XWINDOW (w->hchild), desired_p); | |
1058 } | |
1059 else if (!NILP (w->vchild)) | |
314 | 1060 { |
25012 | 1061 xassert (WINDOWP (w->vchild)); |
1062 clear_window_matrices (XWINDOW (w->vchild), desired_p); | |
1063 } | |
1064 else | |
1065 { | |
1066 if (desired_p) | |
1067 clear_glyph_matrix (w->desired_matrix); | |
1068 else | |
314 | 1069 { |
25012 | 1070 clear_glyph_matrix (w->current_matrix); |
1071 w->window_end_valid = Qnil; | |
314 | 1072 } |
25012 | 1073 } |
1074 | |
1075 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
1076 } | |
1077 } | |
1078 | |
1079 | |
1080 | |
1081 /*********************************************************************** | |
1082 Glyph Rows | |
1083 | |
1084 See dispextern.h for an overall explanation of glyph rows. | |
1085 ***********************************************************************/ | |
1086 | |
1087 /* Clear glyph row ROW. Do it in a way that makes it robust against | |
1088 changes in the glyph_row structure, i.e. addition or removal of | |
1089 structure members. */ | |
1090 | |
33527
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1091 static struct glyph_row null_row; |
c4c7abc48752
(null_row): New gloval static variable.
Kenichi Handa <handa@m17n.org>
parents:
33101
diff
changeset
|
1092 |
25012 | 1093 void |
1094 clear_glyph_row (row) | |
1095 struct glyph_row *row; | |
1096 { | |
1097 struct glyph *p[1 + LAST_AREA]; | |
1098 | |
1099 /* Save pointers. */ | |
1100 p[LEFT_MARGIN_AREA] = row->glyphs[LEFT_MARGIN_AREA]; | |
1101 p[TEXT_AREA] = row->glyphs[TEXT_AREA]; | |
1102 p[RIGHT_MARGIN_AREA] = row->glyphs[RIGHT_MARGIN_AREA]; | |
1103 p[LAST_AREA] = row->glyphs[LAST_AREA]; | |
1104 | |
1105 /* Clear. */ | |
1106 *row = null_row; | |
1107 | |
1108 /* Restore pointers. */ | |
1109 row->glyphs[LEFT_MARGIN_AREA] = p[LEFT_MARGIN_AREA]; | |
1110 row->glyphs[TEXT_AREA] = p[TEXT_AREA]; | |
1111 row->glyphs[RIGHT_MARGIN_AREA] = p[RIGHT_MARGIN_AREA]; | |
1112 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
|
1113 |
b20d72b7aa4b
(clear_glyph_row): Add debug code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
29980
diff
changeset
|
1114 #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
|
1115 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
|
1116 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
|
1117 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
|
1118 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
|
1119 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
|
1120 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
|
1121 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
|
1122 #endif |
25012 | 1123 } |
1124 | |
1125 | |
1126 /* Make ROW an empty, enabled row of canonical character height, | |
1127 in window W starting at y-position Y. */ | |
1128 | |
1129 void | |
1130 blank_row (w, row, y) | |
1131 struct window *w; | |
1132 struct glyph_row *row; | |
1133 int y; | |
1134 { | |
1135 int min_y, max_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1136 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1137 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
|
1138 max_y = WINDOW_BOX_HEIGHT_NO_MODE_LINE (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1139 |
25012 | 1140 clear_glyph_row (row); |
1141 row->y = y; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1142 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
|
1143 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
|
1144 row->visible_height = row->height; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1145 |
25012 | 1146 if (row->y < min_y) |
38587
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1147 row->visible_height -= min_y - row->y; |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1148 if (row->y + row->height > max_y) |
42e75caf68ff
(shift_glyph_matrix, blank_row): Fix computation
Gerd Moellmann <gerd@gnu.org>
parents:
38528
diff
changeset
|
1149 row->visible_height -= row->y + row->height - max_y; |
25012 | 1150 |
1151 row->enabled_p = 1; | |
1152 } | |
1153 | |
1154 | |
1155 /* Increment buffer positions in glyph row ROW. DELTA and DELTA_BYTES | |
1156 are the amounts by which to change positions. Note that the first | |
1157 glyph of the text area of a row can have a buffer position even if | |
1158 the used count of the text area is zero. Such rows display line | |
1159 ends. */ | |
1160 | |
1161 void | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1162 increment_row_positions (row, delta, delta_bytes) |
25012 | 1163 struct glyph_row *row; |
1164 int delta, delta_bytes; | |
1165 { | |
1166 int area, i; | |
1167 | |
1168 /* Increment start and end positions. */ | |
1169 MATRIX_ROW_START_CHARPOS (row) += delta; | |
1170 MATRIX_ROW_START_BYTEPOS (row) += delta_bytes; | |
1171 MATRIX_ROW_END_CHARPOS (row) += delta; | |
1172 MATRIX_ROW_END_BYTEPOS (row) += delta_bytes; | |
1173 | |
1174 /* Increment positions in glyphs. */ | |
1175 for (area = 0; area < LAST_AREA; ++area) | |
1176 for (i = 0; i < row->used[area]; ++i) | |
1177 if (BUFFERP (row->glyphs[area][i].object) | |
1178 && row->glyphs[area][i].charpos > 0) | |
1179 row->glyphs[area][i].charpos += delta; | |
1180 | |
1181 /* Capture the case of rows displaying a line end. */ | |
1182 if (row->used[TEXT_AREA] == 0 | |
1183 && MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1184 row->glyphs[TEXT_AREA]->charpos += delta; | |
1185 } | |
1186 | |
1187 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1188 #if 0 |
25012 | 1189 /* Swap glyphs between two glyph rows A and B. This exchanges glyph |
1190 contents, i.e. glyph structure contents are exchanged between A and | |
1191 B without changing glyph pointers in A and B. */ | |
1192 | |
1193 static void | |
1194 swap_glyphs_in_rows (a, b) | |
1195 struct glyph_row *a, *b; | |
1196 { | |
1197 int area; | |
1198 | |
1199 for (area = 0; area < LAST_AREA; ++area) | |
1200 { | |
1201 /* Number of glyphs to swap. */ | |
1202 int max_used = max (a->used[area], b->used[area]); | |
1203 | |
1204 /* Start of glyphs in area of row A. */ | |
1205 struct glyph *glyph_a = a->glyphs[area]; | |
1206 | |
1207 /* End + 1 of glyphs in area of row A. */ | |
1208 struct glyph *glyph_a_end = a->glyphs[max_used]; | |
1209 | |
1210 /* Start of glyphs in area of row B. */ | |
1211 struct glyph *glyph_b = b->glyphs[area]; | |
1212 | |
1213 while (glyph_a < glyph_a_end) | |
1214 { | |
1215 /* Non-ISO HP/UX compiler doesn't like auto struct | |
1216 initialization. */ | |
1217 struct glyph temp; | |
1218 temp = *glyph_a; | |
1219 *glyph_a = *glyph_b; | |
1220 *glyph_b = temp; | |
1221 ++glyph_a; | |
1222 ++glyph_b; | |
314 | 1223 } |
1224 } | |
1225 } | |
25012 | 1226 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1227 #endif /* 0 */ |
25012 | 1228 |
1229 /* Exchange pointers to glyph memory between glyph rows A and B. */ | |
1230 | |
1231 static INLINE void | |
1232 swap_glyph_pointers (a, b) | |
1233 struct glyph_row *a, *b; | |
1234 { | |
1235 int i; | |
1236 for (i = 0; i < LAST_AREA + 1; ++i) | |
1237 { | |
1238 struct glyph *temp = a->glyphs[i]; | |
1239 a->glyphs[i] = b->glyphs[i]; | |
1240 b->glyphs[i] = temp; | |
1241 } | |
1242 } | |
1243 | |
1244 | |
1245 /* Copy glyph row structure FROM to glyph row structure TO, except | |
1246 that glyph pointers in the structures are left unchanged. */ | |
1247 | |
1248 INLINE void | |
1249 copy_row_except_pointers (to, from) | |
1250 struct glyph_row *to, *from; | |
1251 { | |
1252 struct glyph *pointers[1 + LAST_AREA]; | |
1253 | |
1254 /* Save glyph pointers of TO. */ | |
1255 bcopy (to->glyphs, pointers, sizeof to->glyphs); | |
1256 | |
1257 /* Do a structure assignment. */ | |
1258 *to = *from; | |
1259 | |
1260 /* Restore original pointers of TO. */ | |
1261 bcopy (pointers, to->glyphs, sizeof to->glyphs); | |
1262 } | |
1263 | |
1264 | |
1265 /* Copy contents of glyph row FROM to glyph row TO. Glyph pointers in | |
1266 TO and FROM are left unchanged. Glyph contents are copied from the | |
1267 glyph memory of FROM to the glyph memory of TO. Increment buffer | |
1268 positions in row TO by DELTA/ DELTA_BYTES. */ | |
1269 | |
1270 void | |
1271 copy_glyph_row_contents (to, from, delta, delta_bytes) | |
1272 struct glyph_row *to, *from; | |
1273 int delta, delta_bytes; | |
1274 { | |
1275 int area; | |
1276 | |
1277 /* This is like a structure assignment TO = FROM, except that | |
1278 glyph pointers in the rows are left unchanged. */ | |
1279 copy_row_except_pointers (to, from); | |
1280 | |
1281 /* Copy glyphs from FROM to TO. */ | |
1282 for (area = 0; area < LAST_AREA; ++area) | |
1283 if (from->used[area]) | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1284 bcopy (from->glyphs[area], to->glyphs[area], |
25012 | 1285 from->used[area] * sizeof (struct glyph)); |
1286 | |
1287 /* Increment buffer positions in TO by DELTA. */ | |
28708
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
1288 increment_row_positions (to, delta, delta_bytes); |
25012 | 1289 } |
1290 | |
1291 | |
1292 /* Assign glyph row FROM to glyph row TO. This works like a structure | |
1293 assignment TO = FROM, except that glyph pointers are not copied but | |
1294 exchanged between TO and FROM. Pointers must be exchanged to avoid | |
1295 a memory leak. */ | |
1296 | |
1297 static INLINE void | |
1298 assign_row (to, from) | |
1299 struct glyph_row *to, *from; | |
1300 { | |
1301 swap_glyph_pointers (to, from); | |
1302 copy_row_except_pointers (to, from); | |
1303 } | |
1304 | |
1305 | |
1306 /* Test whether the glyph memory of the glyph row WINDOW_ROW, which is | |
1307 a row in a window matrix, is a slice of the glyph memory of the | |
1308 glyph row FRAME_ROW which is a row in a frame glyph matrix. Value | |
1309 is non-zero if the glyph memory of WINDOW_ROW is part of the glyph | |
1310 memory of FRAME_ROW. */ | |
1311 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
1312 #if GLYPH_DEBUG |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1313 |
25012 | 1314 static int |
1315 glyph_row_slice_p (window_row, frame_row) | |
1316 struct glyph_row *window_row, *frame_row; | |
1317 { | |
1318 struct glyph *window_glyph_start = window_row->glyphs[0]; | |
1319 struct glyph *frame_glyph_start = frame_row->glyphs[0]; | |
1320 struct glyph *frame_glyph_end = frame_row->glyphs[LAST_AREA]; | |
1321 | |
1322 return (frame_glyph_start <= window_glyph_start | |
1323 && window_glyph_start < frame_glyph_end); | |
1324 } | |
1325 | |
30323
4cd1b8fe118c
(direct_output_for_insert): Remove confusing
Gerd Moellmann <gerd@gnu.org>
parents:
30307
diff
changeset
|
1326 #endif /* GLYPH_DEBUG */ |
25012 | 1327 |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1328 #if 0 |
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1329 |
25012 | 1330 /* Find the row in the window glyph matrix WINDOW_MATRIX being a slice |
1331 of ROW in the frame matrix FRAME_MATRIX. Value is null if no row | |
1332 in WINDOW_MATRIX is found satisfying the condition. */ | |
1333 | |
1334 static struct glyph_row * | |
1335 find_glyph_row_slice (window_matrix, frame_matrix, row) | |
1336 struct glyph_matrix *window_matrix, *frame_matrix; | |
1337 int row; | |
1338 { | |
1339 int i; | |
1340 | |
1341 xassert (row >= 0 && row < frame_matrix->nrows); | |
1342 | |
1343 for (i = 0; i < window_matrix->nrows; ++i) | |
1344 if (glyph_row_slice_p (window_matrix->rows + i, | |
1345 frame_matrix->rows + row)) | |
1346 break; | |
1347 | |
1348 return i < window_matrix->nrows ? window_matrix->rows + i : 0; | |
1349 } | |
1350 | |
29336
5ccfe8a1638f
(find_glyph_row_slice, swap_glyphs_in_rows): Put in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents:
28708
diff
changeset
|
1351 #endif /* 0 */ |
25012 | 1352 |
1353 /* Prepare ROW for display. Desired rows are cleared lazily, | |
1354 i.e. they are only marked as to be cleared by setting their | |
1355 enabled_p flag to zero. When a row is to be displayed, a prior | |
1356 call to this function really clears it. */ | |
1357 | |
1358 void | |
1359 prepare_desired_row (row) | |
1360 struct glyph_row *row; | |
1361 { | |
1362 if (!row->enabled_p) | |
1363 { | |
1364 clear_glyph_row (row); | |
1365 row->enabled_p = 1; | |
1366 } | |
1367 } | |
1368 | |
1369 | |
1370 /* Return a hash code for glyph row ROW. */ | |
1371 | |
1372 int | |
1373 line_hash_code (row) | |
1374 struct glyph_row *row; | |
1375 { | |
1376 int hash = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1377 |
25012 | 1378 if (row->enabled_p) |
1379 { | |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1380 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
|
1381 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
|
1382 |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1383 while (glyph < end) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1384 { |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1385 int c = glyph->u.ch; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1386 int face_id = glyph->face_id; |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
1387 if (FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */ |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1388 c -= SPACEGLYPH; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1389 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
|
1390 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
|
1391 ++glyph; |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1392 } |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1393 |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1394 if (hash == 0) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
1395 hash = 1; |
25012 | 1396 } |
1397 | |
1398 return hash; | |
1399 } | |
1400 | |
1401 | |
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
|
1402 /* Return the cost of drawing line VPOS in MATRIX. The cost equals |
25012 | 1403 the number of characters in the line. If must_write_spaces is |
1404 zero, leading and trailing spaces are ignored. */ | |
1405 | |
1406 static unsigned int | |
1407 line_draw_cost (matrix, vpos) | |
1408 struct glyph_matrix *matrix; | |
1409 int vpos; | |
1410 { | |
1411 struct glyph_row *row = matrix->rows + vpos; | |
1412 struct glyph *beg = row->glyphs[TEXT_AREA]; | |
1413 struct glyph *end = beg + row->used[TEXT_AREA]; | |
1414 int len; | |
1415 Lisp_Object *glyph_table_base = GLYPH_TABLE_BASE; | |
1416 int glyph_table_len = GLYPH_TABLE_LENGTH; | |
1417 | |
1418 /* Ignore trailing and leading spaces if we can. */ | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
1419 if (!FRAME_MUST_WRITE_SPACES (SELECTED_FRAME ())) /* XXX Is SELECTED_FRAME OK here? */ |
25012 | 1420 { |
1421 /* 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
|
1422 while (end > beg && CHAR_GLYPH_SPACE_P (*(end - 1))) |
25012 | 1423 --end; |
1424 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1425 /* All blank line. */ |
25012 | 1426 if (end == beg) |
1427 return 0; | |
1428 | |
1429 /* Skip over leading spaces. */ | |
1430 while (CHAR_GLYPH_SPACE_P (*beg)) | |
1431 ++beg; | |
1432 } | |
1433 | |
1434 /* If we don't have a glyph-table, each glyph is one character, | |
1435 so return the number of glyphs. */ | |
1436 if (glyph_table_base == 0) | |
1437 len = end - beg; | |
1438 else | |
1439 { | |
1440 /* Otherwise, scan the glyphs and accumulate their total length | |
1441 in LEN. */ | |
1442 len = 0; | |
1443 while (beg < end) | |
1444 { | |
1445 GLYPH g = GLYPH_FROM_CHAR_GLYPH (*beg); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1446 |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1447 if (g < 0 |
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
1448 || GLYPH_SIMPLE_P (glyph_table_base, glyph_table_len, g)) |
25012 | 1449 len += 1; |
1450 else | |
1451 len += GLYPH_LENGTH (glyph_table_base, g); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1452 |
25012 | 1453 ++beg; |
1454 } | |
1455 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1456 |
25012 | 1457 return len; |
1458 } | |
1459 | |
1460 | |
1461 /* Test two glyph rows A and B for equality. Value is non-zero if A | |
1462 and B have equal contents. W is the window to which the glyphs | |
1463 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
|
1464 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
|
1465 flags of A and B, too. */ |
25012 | 1466 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1467 static INLINE int |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1468 row_equal_p (w, a, b, mouse_face_p) |
25012 | 1469 struct window *w; |
1470 struct glyph_row *a, *b; | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1471 int mouse_face_p; |
25012 | 1472 { |
1473 if (a == b) | |
1474 return 1; | |
1475 else if (a->hash != b->hash) | |
1476 return 0; | |
1477 else | |
1478 { | |
1479 struct glyph *a_glyph, *b_glyph, *a_end; | |
1480 int area; | |
1481 | |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1482 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
|
1483 return 0; |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
1484 |
25012 | 1485 /* Compare glyphs. */ |
1486 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) | |
1487 { | |
1488 if (a->used[area] != b->used[area]) | |
1489 return 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1490 |
25012 | 1491 a_glyph = a->glyphs[area]; |
1492 a_end = a_glyph + a->used[area]; | |
1493 b_glyph = b->glyphs[area]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1494 |
25012 | 1495 while (a_glyph < a_end |
1496 && GLYPH_EQUAL_P (a_glyph, b_glyph)) | |
1497 ++a_glyph, ++b_glyph; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1498 |
25012 | 1499 if (a_glyph != a_end) |
1500 return 0; | |
1501 } | |
1502 | |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1503 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
|
1504 || 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
|
1505 || 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
|
1506 || 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
|
1507 || 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
|
1508 || a->right_fringe_face_id != b->right_fringe_face_id |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
1509 || a->overlay_arrow_p != b->overlay_arrow_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
1510 || 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
|
1511 || a->overlapped_p != b->overlapped_p |
25012 | 1512 || (MATRIX_ROW_CONTINUATION_LINE_P (a) |
1513 != MATRIX_ROW_CONTINUATION_LINE_P (b)) | |
1514 /* Different partially visible characters on left margin. */ | |
1515 || a->x != b->x | |
1516 /* Different height. */ | |
1517 || a->ascent != b->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1518 || a->phys_ascent != b->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
1519 || a->phys_height != b->phys_height |
25012 | 1520 || a->visible_height != b->visible_height) |
1521 return 0; | |
1522 } | |
1523 | |
1524 return 1; | |
1525 } | |
1526 | |
1527 | |
314 | 1528 |
25012 | 1529 /*********************************************************************** |
1530 Glyph Pool | |
1531 | |
1532 See dispextern.h for an overall explanation of glyph pools. | |
1533 ***********************************************************************/ | |
1534 | |
1535 /* Allocate a glyph_pool structure. The structure returned is | |
1536 initialized with zeros. The global variable glyph_pool_count is | |
1537 incremented for each pool allocated. */ | |
1538 | |
1539 static struct glyph_pool * | |
1540 new_glyph_pool () | |
1541 { | |
1542 struct glyph_pool *result; | |
1543 | |
1544 /* Allocate a new glyph_pool and clear it. */ | |
1545 result = (struct glyph_pool *) xmalloc (sizeof *result); | |
1546 bzero (result, sizeof *result); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1547 |
25012 | 1548 /* For memory leak and double deletion checking. */ |
1549 ++glyph_pool_count; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1550 |
25012 | 1551 return result; |
1552 } | |
1553 | |
1554 | |
1555 /* Free a glyph_pool structure POOL. The function may be called with | |
1556 a null POOL pointer. The global variable glyph_pool_count is | |
1557 decremented with every pool structure freed. If this count gets | |
1558 negative, more structures were freed than allocated, i.e. one | |
1559 structure must have been freed more than once or a bogus pointer | |
1560 was passed to free_glyph_pool. */ | |
1561 | |
1562 static void | |
1563 free_glyph_pool (pool) | |
1564 struct glyph_pool *pool; | |
1565 { | |
1566 if (pool) | |
1567 { | |
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
|
1568 /* More freed than allocated? */ |
25012 | 1569 --glyph_pool_count; |
1570 xassert (glyph_pool_count >= 0); | |
1571 | |
1572 xfree (pool->glyphs); | |
1573 xfree (pool); | |
1574 } | |
1575 } | |
1576 | |
1577 | |
1578 /* Enlarge a glyph pool POOL. MATRIX_DIM gives the number of rows and | |
1579 columns we need. This function never shrinks a pool. The only | |
1580 case in which this would make sense, would be when a frame's size | |
1581 is changed from a large value to a smaller one. But, if someone | |
1582 does it once, we can expect that he will do it again. | |
1583 | |
1584 Value is non-zero if the pool changed in a way which makes | |
1585 re-adjusting window glyph matrices necessary. */ | |
1586 | |
1587 static int | |
1588 realloc_glyph_pool (pool, matrix_dim) | |
1589 struct glyph_pool *pool; | |
1590 struct dim matrix_dim; | |
1591 { | |
1592 int needed; | |
1593 int changed_p; | |
1594 | |
1595 changed_p = (pool->glyphs == 0 | |
1596 || matrix_dim.height != pool->nrows | |
1597 || matrix_dim.width != pool->ncolumns); | |
1598 | |
1599 /* Enlarge the glyph pool. */ | |
1600 needed = matrix_dim.width * matrix_dim.height; | |
1601 if (needed > pool->nglyphs) | |
1602 { | |
1603 int size = needed * sizeof (struct glyph); | |
1604 | |
1605 if (pool->glyphs) | |
1606 pool->glyphs = (struct glyph *) xrealloc (pool->glyphs, size); | |
1607 else | |
1608 { | |
1609 pool->glyphs = (struct glyph *) xmalloc (size); | |
1610 bzero (pool->glyphs, size); | |
1611 } | |
1612 | |
1613 pool->nglyphs = needed; | |
1614 } | |
1615 | |
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
|
1616 /* Remember the number of rows and columns because (a) we use them |
25012 | 1617 to do sanity checks, and (b) the number of columns determines |
1618 where rows in the frame matrix start---this must be available to | |
1619 determine pointers to rows of window sub-matrices. */ | |
1620 pool->nrows = matrix_dim.height; | |
1621 pool->ncolumns = matrix_dim.width; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1622 |
25012 | 1623 return changed_p; |
1624 } | |
1625 | |
1626 | |
1627 | |
1628 /*********************************************************************** | |
1629 Debug Code | |
1630 ***********************************************************************/ | |
1631 | |
1632 #if GLYPH_DEBUG | |
1633 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1634 |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1635 /* Flush standard output. This is sometimes useful to call from the debugger. |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1636 XXX Maybe this should be changed to flush the current terminal instead of |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1637 stdout. |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
1638 */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1639 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1640 void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1641 flush_stdout () |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1642 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1643 fflush (stdout); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1644 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1645 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
1646 |
25012 | 1647 /* Check that no glyph pointers have been lost in MATRIX. If a |
1648 pointer has been lost, e.g. by using a structure assignment between | |
1649 rows, at least one pointer must occur more than once in the rows of | |
1650 MATRIX. */ | |
1651 | |
1652 void | |
1653 check_matrix_pointer_lossage (matrix) | |
1654 struct glyph_matrix *matrix; | |
1655 { | |
1656 int i, j; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1657 |
25012 | 1658 for (i = 0; i < matrix->nrows; ++i) |
1659 for (j = 0; j < matrix->nrows; ++j) | |
1660 xassert (i == j | |
1661 || (matrix->rows[i].glyphs[TEXT_AREA] | |
1662 != matrix->rows[j].glyphs[TEXT_AREA])); | |
1663 } | |
1664 | |
1665 | |
1666 /* Get a pointer to glyph row ROW in MATRIX, with bounds checks. */ | |
1667 | |
1668 struct glyph_row * | |
1669 matrix_row (matrix, row) | |
1670 struct glyph_matrix *matrix; | |
1671 int row; | |
1672 { | |
1673 xassert (matrix && matrix->rows); | |
1674 xassert (row >= 0 && row < matrix->nrows); | |
1675 | |
1676 /* That's really too slow for normal testing because this function | |
1677 is called almost everywhere. Although---it's still astonishingly | |
1678 fast, so it is valuable to have for debugging purposes. */ | |
314 | 1679 #if 0 |
25012 | 1680 check_matrix_pointer_lossage (matrix); |
1681 #endif | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1682 |
25012 | 1683 return matrix->rows + row; |
1684 } | |
1685 | |
1686 | |
1687 #if 0 /* This function makes invalid assumptions when text is | |
1688 partially invisible. But it might come handy for debugging | |
1689 nevertheless. */ | |
1690 | |
1691 /* Check invariants that must hold for an up to date current matrix of | |
1692 window W. */ | |
1693 | |
1694 static void | |
1695 check_matrix_invariants (w) | |
314 | 1696 struct window *w; |
1697 { | |
25012 | 1698 struct glyph_matrix *matrix = w->current_matrix; |
1699 int yb = window_text_bottom_y (w); | |
1700 struct glyph_row *row = matrix->rows; | |
1701 struct glyph_row *last_text_row = NULL; | |
1702 struct buffer *saved = current_buffer; | |
1703 struct buffer *buffer = XBUFFER (w->buffer); | |
1704 int c; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1705 |
25012 | 1706 /* This can sometimes happen for a fresh window. */ |
1707 if (matrix->nrows < 2) | |
1708 return; | |
1709 | |
1710 set_buffer_temp (buffer); | |
1711 | |
1712 /* Note: last row is always reserved for the mode line. */ | |
1713 while (MATRIX_ROW_DISPLAYS_TEXT_P (row) | |
1714 && MATRIX_ROW_BOTTOM_Y (row) < yb) | |
1715 { | |
1716 struct glyph_row *next = row + 1; | |
1717 | |
1718 if (MATRIX_ROW_DISPLAYS_TEXT_P (row)) | |
1719 last_text_row = row; | |
1720 | |
1721 /* Check that character and byte positions are in sync. */ | |
1722 xassert (MATRIX_ROW_START_BYTEPOS (row) | |
1723 == CHAR_TO_BYTE (MATRIX_ROW_START_CHARPOS (row))); | |
1724 | |
1725 /* CHAR_TO_BYTE aborts when invoked for a position > Z. We can | |
1726 have such a position temporarily in case of a minibuffer | |
1727 displaying something like `[Sole completion]' at its end. */ | |
1728 if (MATRIX_ROW_END_CHARPOS (row) < BUF_ZV (current_buffer)) | |
1729 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1730 == CHAR_TO_BYTE (MATRIX_ROW_END_CHARPOS (row))); | |
1731 | |
1732 /* Check that end position of `row' is equal to start position | |
1733 of next row. */ | |
1734 if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next)) | |
1735 { | |
1736 xassert (MATRIX_ROW_END_CHARPOS (row) | |
1737 == MATRIX_ROW_START_CHARPOS (next)); | |
1738 xassert (MATRIX_ROW_END_BYTEPOS (row) | |
1739 == MATRIX_ROW_START_BYTEPOS (next)); | |
1740 } | |
1741 row = next; | |
1742 } | |
1743 | |
1744 xassert (w->current_matrix->nrows == w->desired_matrix->nrows); | |
1745 xassert (w->desired_matrix->rows != NULL); | |
1746 set_buffer_temp (saved); | |
1747 } | |
1748 | |
1749 #endif /* 0 */ | |
1750 | |
1751 #endif /* GLYPH_DEBUG != 0 */ | |
1752 | |
1753 | |
1754 | |
1755 /********************************************************************** | |
1756 Allocating/ Adjusting Glyph Matrices | |
1757 **********************************************************************/ | |
1758 | |
1759 /* Allocate glyph matrices over a window tree for a frame-based | |
1760 redisplay | |
1761 | |
1762 X and Y are column/row within the frame glyph matrix where | |
1763 sub-matrices for the window tree rooted at WINDOW must be | |
1764 allocated. CH_DIM contains the dimensions of the smallest | |
1765 character that could be used during display. DIM_ONLY_P non-zero | |
1766 means that the caller of this function is only interested in the | |
1767 result matrix dimension, and matrix adjustments should not be | |
1768 performed. | |
1769 | |
1770 The function returns the total width/height of the sub-matrices of | |
1771 the window tree. If called on a frame root window, the computation | |
1772 will take the mini-buffer window into account. | |
1773 | |
1774 *WINDOW_CHANGE_FLAGS is set to a bit mask with bits | |
1775 | |
1776 NEW_LEAF_MATRIX set if any window in the tree did not have a | |
1777 glyph matrices yet, and | |
1778 | |
1779 CHANGED_LEAF_MATRIX set if the dimension or location of a matrix of | |
1780 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
|
1781 DIM_ONLY_P) |
25012 | 1782 |
1783 *WINDOW_CHANGE_FLAGS must be initialized by the caller of this | |
1784 function. | |
1785 | |
1786 Windows are arranged into chains of windows on the same level | |
1787 through the next fields of window structures. Such a level can be | |
1788 either a sequence of horizontally adjacent windows from left to | |
1789 right, or a sequence of vertically adjacent windows from top to | |
1790 bottom. Each window in a horizontal sequence can be either a leaf | |
1791 window or a vertical sequence; a window in a vertical sequence can | |
1792 be either a leaf or a horizontal sequence. All windows in a | |
1793 horizontal sequence have the same height, and all windows in a | |
1794 vertical sequence have the same width. | |
1795 | |
1796 This function uses, for historical reasons, a more general | |
1797 algorithm to determine glyph matrix dimensions that would be | |
1798 necessary. | |
1799 | |
1800 The matrix height of a horizontal sequence is determined by the | |
1801 maximum height of any matrix in the sequence. The matrix width of | |
1802 a horizontal sequence is computed by adding up matrix widths of | |
1803 windows in the sequence. | |
1804 | |
1805 |<------- result width ------->| | |
1806 +---------+----------+---------+ --- | |
1807 | | | | | | |
1808 | | | | | |
1809 +---------+ | | result height | |
1810 | +---------+ | |
1811 | | | | |
1812 +----------+ --- | |
1813 | |
1814 The matrix width of a vertical sequence is the maximum matrix width | |
1815 of any window in the sequence. Its height is computed by adding up | |
1816 matrix heights of windows in the sequence. | |
1817 | |
1818 |<---- result width -->| | |
1819 +---------+ --- | |
1820 | | | | |
1821 | | | | |
1822 +---------+--+ | | |
1823 | | | | |
1824 | | result height | |
1825 | | | |
1826 +------------+---------+ | | |
1827 | | | | |
1828 | | | | |
1829 +------------+---------+ --- */ | |
1830 | |
1831 /* Bit indicating that a new matrix will be allocated or has been | |
1832 allocated. */ | |
1833 | |
1834 #define NEW_LEAF_MATRIX (1 << 0) | |
1835 | |
1836 /* Bit indicating that a matrix will or has changed its location or | |
1837 size. */ | |
1838 | |
1839 #define CHANGED_LEAF_MATRIX (1 << 1) | |
1840 | |
1841 static struct dim | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1842 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
|
1843 window_change_flags) |
25012 | 1844 Lisp_Object window; |
1845 int x, y; | |
1846 int dim_only_p; | |
1847 int *window_change_flags; | |
1848 { | |
1849 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | |
1850 int x0 = x, y0 = y; | |
1851 int wmax = 0, hmax = 0; | |
1852 struct dim total; | |
1853 struct dim dim; | |
1854 struct window *w; | |
1855 int in_horz_combination_p; | |
1856 | |
1857 /* What combination is WINDOW part of? Compute this once since the | |
1858 result is the same for all windows in the `next' chain. The | |
1859 special case of a root window (parent equal to nil) is treated | |
1860 like a vertical combination because a root window's `next' | |
1861 points to the mini-buffer window, if any, which is arranged | |
1862 vertically below other windows. */ | |
1863 in_horz_combination_p | |
1864 = (!NILP (XWINDOW (window)->parent) | |
1865 && !NILP (XWINDOW (XWINDOW (window)->parent)->hchild)); | |
1866 | |
1867 /* For WINDOW and all windows on the same level. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1868 do |
25012 | 1869 { |
1870 w = XWINDOW (window); | |
1871 | |
1872 /* 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
|
1873 on whether this is a combination or a leaf window. */ |
25012 | 1874 if (!NILP (w->hchild)) |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1875 dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, |
25012 | 1876 dim_only_p, |
1877 window_change_flags); | |
1878 else if (!NILP (w->vchild)) | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1879 dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, |
25012 | 1880 dim_only_p, |
1881 window_change_flags); | |
1882 else | |
1883 { | |
1884 /* If not already done, allocate sub-matrix structures. */ | |
1885 if (w->desired_matrix == NULL) | |
1886 { | |
1887 w->desired_matrix = new_glyph_matrix (f->desired_pool); | |
1888 w->current_matrix = new_glyph_matrix (f->current_pool); | |
1889 *window_change_flags |= NEW_LEAF_MATRIX; | |
1890 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1891 |
25012 | 1892 /* Width and height MUST be chosen so that there are no |
1893 holes in the frame matrix. */ | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1894 dim.width = required_matrix_width (w); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1895 dim.height = required_matrix_height (w); |
25012 | 1896 |
1897 /* Will matrix be re-allocated? */ | |
1898 if (x != w->desired_matrix->matrix_x | |
1899 || y != w->desired_matrix->matrix_y | |
1900 || dim.width != w->desired_matrix->matrix_w | |
1901 || dim.height != w->desired_matrix->matrix_h | |
1902 || (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
|
1903 w->right_margin_cols) |
25012 | 1904 != w->desired_matrix->left_margin_glyphs) |
1905 || (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
|
1906 w->left_margin_cols) |
25012 | 1907 != w->desired_matrix->right_margin_glyphs)) |
1908 *window_change_flags |= CHANGED_LEAF_MATRIX; | |
1909 | |
1910 /* Actually change matrices, if allowed. Do not consider | |
1911 CHANGED_LEAF_MATRIX computed above here because the pool | |
1912 may have been changed which we don't now here. We trust | |
1913 that we only will be called with DIM_ONLY_P != 0 when | |
1914 necessary. */ | |
1915 if (!dim_only_p) | |
1916 { | |
1917 adjust_glyph_matrix (w, w->desired_matrix, x, y, dim); | |
1918 adjust_glyph_matrix (w, w->current_matrix, x, y, dim); | |
1919 } | |
1920 } | |
1921 | |
1922 /* If we are part of a horizontal combination, advance x for | |
1923 windows to the right of W; otherwise advance y for windows | |
1924 below W. */ | |
1925 if (in_horz_combination_p) | |
1926 x += dim.width; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1927 else |
25012 | 1928 y += dim.height; |
1929 | |
1930 /* Remember maximum glyph matrix dimensions. */ | |
1931 wmax = max (wmax, dim.width); | |
1932 hmax = max (hmax, dim.height); | |
1933 | |
1934 /* Next window on same level. */ | |
1935 window = w->next; | |
1936 } | |
1937 while (!NILP (window)); | |
1938 | |
1939 /* Set `total' to the total glyph matrix dimension of this window | |
1940 level. In a vertical combination, the width is the width of the | |
1941 widest window; the height is the y we finally reached, corrected | |
1942 by the y we started with. In a horizontal combination, the total | |
1943 height is the height of the tallest window, and the width is the | |
1944 x we finally reached, corrected by the x we started with. */ | |
1945 if (in_horz_combination_p) | |
1946 { | |
1947 total.width = x - x0; | |
1948 total.height = hmax; | |
1949 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1950 else |
25012 | 1951 { |
1952 total.width = wmax; | |
1953 total.height = y - y0; | |
1954 } | |
1955 | |
1956 return total; | |
1957 } | |
1958 | |
1959 | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1960 /* 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
|
1961 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1962 int |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1963 required_matrix_height (w) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1964 struct window *w; |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1965 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1966 #ifdef HAVE_WINDOW_SYSTEM |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1967 struct frame *f = XFRAME (w->frame); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1968 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1969 if (FRAME_WINDOW_P (f)) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1970 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1971 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
|
1972 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
|
1973 return (((window_pixel_height + ch_height - 1) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1974 / ch_height) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1975 /* 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
|
1976 bottom of the window. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1977 + 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
|
1978 /* 2 for header and mode line. */ |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1979 + 2); |
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 #endif /* HAVE_WINDOW_SYSTEM */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1982 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
1983 return WINDOW_TOTAL_LINES (w); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1984 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1985 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1986 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1987 /* 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
|
1988 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1989 int |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1990 required_matrix_width (w) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1991 struct window *w; |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1992 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1993 #ifdef HAVE_WINDOW_SYSTEM |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1994 struct frame *f = XFRAME (w->frame); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1995 if (FRAME_WINDOW_P (f)) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1996 { |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
1997 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
|
1998 int window_pixel_width = WINDOW_TOTAL_WIDTH (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
1999 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2000 /* 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
|
2001 return (((window_pixel_width + ch_width - 1) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2002 / ch_width) |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2003 /* 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
|
2004 + 2 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2005 /* One partially visible column at the right |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2006 edge of each marginal area. */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2007 + 1 + 1); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2008 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2009 #endif /* HAVE_WINDOW_SYSTEM */ |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2010 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2011 return XINT (w->total_cols); |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2012 } |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2013 |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2014 |
25012 | 2015 /* Allocate window matrices for window-based redisplay. W is the |
2016 window whose matrices must be allocated/reallocated. CH_DIM is the | |
2017 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
|
2018 |
25012 | 2019 static void |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2020 allocate_matrices_for_window_redisplay (w) |
25012 | 2021 struct window *w; |
2022 { | |
2023 while (w) | |
314 | 2024 { |
25012 | 2025 if (!NILP (w->vchild)) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2026 allocate_matrices_for_window_redisplay (XWINDOW (w->vchild)); |
25012 | 2027 else if (!NILP (w->hchild)) |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2028 allocate_matrices_for_window_redisplay (XWINDOW (w->hchild)); |
25012 | 2029 else |
314 | 2030 { |
25012 | 2031 /* W is a leaf window. */ |
2032 struct dim dim; | |
2033 | |
2034 /* If matrices are not yet allocated, allocate them now. */ | |
2035 if (w->desired_matrix == NULL) | |
314 | 2036 { |
25012 | 2037 w->desired_matrix = new_glyph_matrix (NULL); |
2038 w->current_matrix = new_glyph_matrix (NULL); | |
314 | 2039 } |
25012 | 2040 |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2041 dim.width = required_matrix_width (w); |
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2042 dim.height = required_matrix_height (w); |
25012 | 2043 adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim); |
2044 adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim); | |
2045 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2046 |
25012 | 2047 w = NILP (w->next) ? NULL : XWINDOW (w->next); |
2048 } | |
2049 } | |
2050 | |
2051 | |
2052 /* Re-allocate/ re-compute glyph matrices on frame F. If F is null, | |
2053 do it for all frames; otherwise do it just for the given frame. | |
2054 This function must be called when a new frame is created, its size | |
2055 changes, or its window configuration changes. */ | |
2056 | |
2057 void | |
2058 adjust_glyphs (f) | |
2059 struct frame *f; | |
2060 { | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2061 /* 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
|
2062 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
|
2063 BLOCK_INPUT; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2064 |
25012 | 2065 if (f) |
2066 adjust_frame_glyphs (f); | |
2067 else | |
2068 { | |
2069 Lisp_Object tail, lisp_frame; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2070 |
25012 | 2071 FOR_EACH_FRAME (tail, lisp_frame) |
2072 adjust_frame_glyphs (XFRAME (lisp_frame)); | |
2073 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2074 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
2075 UNBLOCK_INPUT; |
25012 | 2076 } |
2077 | |
2078 | |
2079 /* Adjust frame glyphs when Emacs is initialized. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2080 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2081 To be called from init_display. |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2082 |
25012 | 2083 We need a glyph matrix because redraw will happen soon. |
2084 Unfortunately, window sizes on selected_frame are not yet set to | |
2085 meaningful values. I believe we can assume that there are only two | |
2086 windows on the frame---the mini-buffer and the root window. Frame | |
2087 height and width seem to be correct so far. So, set the sizes of | |
2088 windows to estimated values. */ | |
2089 | |
2090 static void | |
2091 adjust_frame_glyphs_initially () | |
2092 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2093 struct frame *sf = SELECTED_FRAME (); |
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2094 struct window *root = XWINDOW (sf->root_window); |
25012 | 2095 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
|
2096 int frame_lines = FRAME_LINES (sf); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2097 int frame_cols = FRAME_COLS (sf); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2098 int top_margin = FRAME_TOP_MARGIN (sf); |
25012 | 2099 |
2100 /* 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
|
2101 XSETFASTINT (root->top_line, top_margin); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2102 XSETFASTINT (root->total_cols, frame_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2103 set_window_height (sf->root_window, frame_lines - 1 - top_margin, 0); |
25012 | 2104 |
2105 /* 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
|
2106 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
|
2107 XSETFASTINT (mini->total_cols, frame_cols); |
25012 | 2108 set_window_height (root->next, 1, 0); |
2109 | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
2110 adjust_frame_glyphs (sf); |
25012 | 2111 glyphs_initialized_initially_p = 1; |
2112 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2113 |
25012 | 2114 |
2115 /* Allocate/reallocate glyph matrices of a single frame F. */ | |
2116 | |
2117 static void | |
2118 adjust_frame_glyphs (f) | |
2119 struct frame *f; | |
2120 { | |
2121 if (FRAME_WINDOW_P (f)) | |
2122 adjust_frame_glyphs_for_window_redisplay (f); | |
2123 else | |
2124 adjust_frame_glyphs_for_frame_redisplay (f); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2125 |
25012 | 2126 /* Don't forget the message buffer and the buffer for |
2127 decode_mode_spec. */ | |
2128 adjust_frame_message_buffer (f); | |
2129 adjust_decode_mode_spec_buffer (f); | |
2130 | |
2131 f->glyphs_initialized_p = 1; | |
2132 } | |
2133 | |
2134 | |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2135 /* 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
|
2136 windows from the frame's current matrix. */ |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2137 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2138 static void |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2139 fake_current_matrices (window) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2140 Lisp_Object window; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2141 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2142 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2143 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2144 for (; !NILP (window); window = w->next) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2145 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2146 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2147 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2148 if (!NILP (w->hchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2149 fake_current_matrices (w->hchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2150 else if (!NILP (w->vchild)) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2151 fake_current_matrices (w->vchild); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2152 else |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2153 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2154 int i; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2155 struct frame *f = XFRAME (w->frame); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2156 struct glyph_matrix *m = w->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2157 struct glyph_matrix *fm = f->current_matrix; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2158 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2159 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
|
2160 xassert (m->matrix_w == WINDOW_TOTAL_COLS (w)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2161 |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2162 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
|
2163 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2164 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
|
2165 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
|
2166 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2167 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
|
2168 && 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
|
2169 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2170 r->enabled_p = fr->enabled_p; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2171 if (r->enabled_p) |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2172 { |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2173 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
|
2174 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
|
2175 r->used[TEXT_AREA] = (m->matrix_w |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2176 - r->used[LEFT_MARGIN_AREA] |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2177 - r->used[RIGHT_MARGIN_AREA]); |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2178 r->mode_line_p = 0; |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2179 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2180 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2181 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2182 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2183 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2184 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2185 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2186 /* 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
|
2187 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
|
2188 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2189 static struct glyph_matrix * |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2190 save_current_matrix (f) |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2191 struct frame *f; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2192 { |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2193 int i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2194 struct glyph_matrix *saved; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2195 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2196 saved = (struct glyph_matrix *) xmalloc (sizeof *saved); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2197 bzero (saved, sizeof *saved); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2198 saved->nrows = f->current_matrix->nrows; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2199 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
|
2200 * sizeof *saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2201 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
|
2202 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2203 for (i = 0; i < saved->nrows; ++i) |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2204 { |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2205 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
|
2206 struct glyph_row *to = saved->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2207 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
|
2208 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
|
2209 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
|
2210 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
|
2211 } |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2212 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2213 return saved; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2214 } |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2215 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2216 |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2217 /* 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
|
2218 and free memory associated with SAVED. */ |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2219 |
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2220 static void |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2221 restore_current_matrix (f, saved) |
34849
eac70be4cb58
(save_frame_matrix, restore_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34788
diff
changeset
|
2222 struct frame *f; |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2223 struct glyph_matrix *saved; |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2224 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2225 int i; |
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 for (i = 0; i < saved->nrows; ++i) |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2228 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2229 struct glyph_row *from = saved->rows + i; |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2230 struct glyph_row *to = f->current_matrix->rows + i; |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2231 size_t nbytes = from->used[TEXT_AREA] * sizeof (struct glyph); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2232 bcopy (from->glyphs[TEXT_AREA], to->glyphs[TEXT_AREA], nbytes); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2233 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
|
2234 xfree (from->glyphs[TEXT_AREA]); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2235 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2236 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2237 xfree (saved->rows); |
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2238 xfree (saved); |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2239 } |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2240 |
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2241 |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2242 |
25012 | 2243 /* Allocate/reallocate glyph matrices of a single frame F for |
2244 frame-based redisplay. */ | |
2245 | |
2246 static void | |
2247 adjust_frame_glyphs_for_frame_redisplay (f) | |
2248 struct frame *f; | |
2249 { | |
2250 struct dim ch_dim; | |
2251 struct dim matrix_dim; | |
2252 int pool_changed_p; | |
2253 int window_change_flags; | |
2254 int top_window_y; | |
2255 | |
2256 if (!FRAME_LIVE_P (f)) | |
2257 return; | |
2258 | |
2259 /* Determine the smallest character in any font for F. On | |
2260 console windows, all characters have dimension (1, 1). */ | |
2261 ch_dim.width = ch_dim.height = 1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2262 |
25012 | 2263 top_window_y = FRAME_TOP_MARGIN (f); |
2264 | |
2265 /* Allocate glyph pool structures if not already done. */ | |
2266 if (f->desired_pool == NULL) | |
2267 { | |
2268 f->desired_pool = new_glyph_pool (); | |
2269 f->current_pool = new_glyph_pool (); | |
2270 } | |
2271 | |
2272 /* Allocate frames matrix structures if needed. */ | |
2273 if (f->desired_matrix == NULL) | |
2274 { | |
2275 f->desired_matrix = new_glyph_matrix (f->desired_pool); | |
2276 f->current_matrix = new_glyph_matrix (f->current_pool); | |
2277 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2278 |
25012 | 2279 /* Compute window glyph matrices. (This takes the mini-buffer |
2280 window into account). The result is the size of the frame glyph | |
2281 matrix needed. The variable window_change_flags is set to a bit | |
2282 mask indicating whether new matrices will be allocated or | |
2283 existing matrices change their size or location within the frame | |
2284 matrix. */ | |
2285 window_change_flags = 0; | |
2286 matrix_dim | |
2287 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f), | |
2288 0, top_window_y, | |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2289 1, |
25012 | 2290 &window_change_flags); |
2291 | |
2292 /* Add in menu bar lines, if any. */ | |
2293 matrix_dim.height += top_window_y; | |
2294 | |
2295 /* Enlarge pools as necessary. */ | |
2296 pool_changed_p = realloc_glyph_pool (f->desired_pool, matrix_dim); | |
2297 realloc_glyph_pool (f->current_pool, matrix_dim); | |
2298 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2299 /* Set up glyph pointers within window matrices. Do this only if |
25012 | 2300 absolutely necessary since it requires a frame redraw. */ |
2301 if (pool_changed_p || window_change_flags) | |
2302 { | |
2303 /* Do it for window matrices. */ | |
2304 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
|
2305 0, top_window_y, 0, |
25012 | 2306 &window_change_flags); |
2307 | |
2308 /* Size of frame matrices must equal size of frame. Note | |
2309 that we are called for X frames with window widths NOT equal | |
2310 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
|
2311 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
|
2312 && matrix_dim.height == FRAME_LINES (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2313 |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2314 /* Pointers to glyph memory in glyph rows are exchanged during |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2315 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
|
2316 frame's current matrix consists of pointers into both the |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2317 desired and current glyph pool of the frame. Adjusting a |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2318 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
|
2319 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
|
2320 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
|
2321 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
|
2322 matrix' contents from that copy. */ |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2323 if (display_completed |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2324 && !FRAME_GARBAGED_P (f) |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2325 && matrix_dim.width == f->current_matrix->matrix_w |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2326 && matrix_dim.height == f->current_matrix->matrix_h) |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2327 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2328 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
|
2329 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
|
2330 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
|
2331 restore_current_matrix (f, copy); |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2332 fake_current_matrices (FRAME_ROOT_WINDOW (f)); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2333 } |
34736
51a0fe34dfc6
(fake_current_matrices, ensure_frame_matrix): New
Gerd Moellmann <gerd@gnu.org>
parents:
34715
diff
changeset
|
2334 else |
34788
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2335 { |
35307
8e3c6f1a31ab
(save_or_restore_current_matrices): Function removed.
Gerd Moellmann <gerd@gnu.org>
parents:
35269
diff
changeset
|
2336 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
|
2337 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
|
2338 SET_FRAME_GARBAGED (f); |
9512f05b60d1
(ensure_frame_matrix): Removed.
Gerd Moellmann <gerd@gnu.org>
parents:
34736
diff
changeset
|
2339 } |
25012 | 2340 } |
2341 } | |
2342 | |
2343 | |
2344 /* Allocate/reallocate glyph matrices of a single frame F for | |
2345 window-based redisplay. */ | |
2346 | |
2347 static void | |
2348 adjust_frame_glyphs_for_window_redisplay (f) | |
2349 struct frame *f; | |
2350 { | |
2351 struct dim ch_dim; | |
2352 struct window *w; | |
2353 | |
2354 xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2355 |
25012 | 2356 /* Get minimum sizes. */ |
2357 #ifdef HAVE_WINDOW_SYSTEM | |
2358 ch_dim.width = FRAME_SMALLEST_CHAR_WIDTH (f); | |
2359 ch_dim.height = FRAME_SMALLEST_FONT_HEIGHT (f); | |
2360 #else | |
2361 ch_dim.width = ch_dim.height = 1; | |
2362 #endif | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2363 |
25012 | 2364 /* Allocate/reallocate window matrices. */ |
39448
b74c165ef22f
(required_matrix_width, required_matrix_height): New
Gerd Moellmann <gerd@gnu.org>
parents:
39254
diff
changeset
|
2365 allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f))); |
25012 | 2366 |
2367 /* Allocate/ reallocate matrices of the dummy window used to display | |
2368 the menu bar under X when no X toolkit support is available. */ | |
49322 | 2369 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) |
25012 | 2370 { |
2371 /* Allocate a dummy window if not already done. */ | |
2372 if (NILP (f->menu_bar_window)) | |
2373 { | |
2374 f->menu_bar_window = make_window (); | |
2375 w = XWINDOW (f->menu_bar_window); | |
2376 XSETFRAME (w->frame, f); | |
2377 w->pseudo_window_p = 1; | |
2378 } | |
2379 else | |
2380 w = XWINDOW (f->menu_bar_window); | |
2381 | |
2382 /* Set window dimensions to frame dimensions and allocate or | |
2383 adjust glyph matrices of W. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2384 XSETFASTINT (w->top_line, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2385 XSETFASTINT (w->left_col, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2386 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
|
2387 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
|
2388 allocate_matrices_for_window_redisplay (w); |
25012 | 2389 } |
2390 #endif /* not USE_X_TOOLKIT */ | |
2391 | |
49322 | 2392 #ifndef USE_GTK |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2393 /* 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
|
2394 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
|
2395 if (NILP (f->tool_bar_window)) |
25012 | 2396 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2397 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
|
2398 w = XWINDOW (f->tool_bar_window); |
25012 | 2399 XSETFRAME (w->frame, f); |
2400 w->pseudo_window_p = 1; | |
2401 } | |
2402 else | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2403 w = XWINDOW (f->tool_bar_window); |
25012 | 2404 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2405 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
|
2406 XSETFASTINT (w->left_col, 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
2407 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
|
2408 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
|
2409 allocate_matrices_for_window_redisplay (w); |
49322 | 2410 #endif |
25012 | 2411 } |
2412 | |
2413 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2414 /* Adjust/ allocate message buffer of frame F. |
25012 | 2415 |
2416 Note that the message buffer is never freed. Since I could not | |
2417 find a free in 19.34, I assume that freeing it would be | |
2418 problematic in some way and don't do it either. | |
2419 | |
2420 (Implementation note: It should be checked if we can free it | |
2421 eventually without causing trouble). */ | |
2422 | |
2423 static void | |
2424 adjust_frame_message_buffer (f) | |
2425 struct frame *f; | |
2426 { | |
2427 int size = FRAME_MESSAGE_BUF_SIZE (f) + 1; | |
2428 | |
2429 if (FRAME_MESSAGE_BUF (f)) | |
2430 { | |
2431 char *buffer = FRAME_MESSAGE_BUF (f); | |
2432 char *new_buffer = (char *) xrealloc (buffer, size); | |
2433 FRAME_MESSAGE_BUF (f) = new_buffer; | |
2434 } | |
2435 else | |
2436 FRAME_MESSAGE_BUF (f) = (char *) xmalloc (size); | |
2437 } | |
2438 | |
2439 | |
2440 /* Re-allocate buffer for decode_mode_spec on frame F. */ | |
2441 | |
2442 static void | |
2443 adjust_decode_mode_spec_buffer (f) | |
2444 struct frame *f; | |
2445 { | |
2446 f->decode_mode_spec_buffer | |
2447 = (char *) xrealloc (f->decode_mode_spec_buffer, | |
2448 FRAME_MESSAGE_BUF_SIZE (f) + 1); | |
2449 } | |
2450 | |
2451 | |
2452 | |
2453 /********************************************************************** | |
2454 Freeing Glyph Matrices | |
2455 **********************************************************************/ | |
2456 | |
2457 /* Free glyph memory for a frame F. F may be null. This function can | |
2458 be called for the same frame more than once. The root window of | |
2459 F may be nil when this function is called. This is the case when | |
2460 the function is called when F is destroyed. */ | |
2461 | |
2462 void | |
2463 free_glyphs (f) | |
2464 struct frame *f; | |
2465 { | |
2466 if (f && f->glyphs_initialized_p) | |
2467 { | |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2468 /* 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
|
2469 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
|
2470 BLOCK_INPUT; |
25012 | 2471 f->glyphs_initialized_p = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2472 |
25012 | 2473 /* Release window sub-matrices. */ |
2474 if (!NILP (f->root_window)) | |
2475 free_window_matrices (XWINDOW (f->root_window)); | |
2476 | |
2477 /* Free the dummy window for menu bars without X toolkit and its | |
2478 glyph matrices. */ | |
2479 if (!NILP (f->menu_bar_window)) | |
2480 { | |
2481 struct window *w = XWINDOW (f->menu_bar_window); | |
2482 free_glyph_matrix (w->desired_matrix); | |
2483 free_glyph_matrix (w->current_matrix); | |
2484 w->desired_matrix = w->current_matrix = NULL; | |
2485 f->menu_bar_window = Qnil; | |
2486 } | |
2487 | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2488 /* 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
|
2489 if (!NILP (f->tool_bar_window)) |
25012 | 2490 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
2491 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 2492 free_glyph_matrix (w->desired_matrix); |
2493 free_glyph_matrix (w->current_matrix); | |
2494 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
|
2495 f->tool_bar_window = Qnil; |
25012 | 2496 } |
2497 | |
2498 /* Release frame glyph matrices. Reset fields to zero in | |
2499 case we are called a second time. */ | |
2500 if (f->desired_matrix) | |
2501 { | |
2502 free_glyph_matrix (f->desired_matrix); | |
2503 free_glyph_matrix (f->current_matrix); | |
2504 f->desired_matrix = f->current_matrix = NULL; | |
2505 } | |
2506 | |
2507 /* Release glyph pools. */ | |
2508 if (f->desired_pool) | |
2509 { | |
2510 free_glyph_pool (f->desired_pool); | |
2511 free_glyph_pool (f->current_pool); | |
2512 f->desired_pool = f->current_pool = NULL; | |
314 | 2513 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2514 |
27968
7634011b93f3
(free_glyphs): Block input while freeing matrices.
Gerd Moellmann <gerd@gnu.org>
parents:
27855
diff
changeset
|
2515 UNBLOCK_INPUT; |
314 | 2516 } |
2517 } | |
2518 | |
25012 | 2519 |
2520 /* Free glyph sub-matrices in the window tree rooted at W. This | |
2521 function may be called with a null pointer, and it may be called on | |
2522 the same tree more than once. */ | |
2523 | |
2524 void | |
2525 free_window_matrices (w) | |
2526 struct window *w; | |
2527 { | |
2528 while (w) | |
2529 { | |
2530 if (!NILP (w->hchild)) | |
2531 free_window_matrices (XWINDOW (w->hchild)); | |
2532 else if (!NILP (w->vchild)) | |
2533 free_window_matrices (XWINDOW (w->vchild)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2534 else |
25012 | 2535 { |
2536 /* This is a leaf window. Free its memory and reset fields | |
2537 to zero in case this function is called a second time for | |
2538 W. */ | |
2539 free_glyph_matrix (w->current_matrix); | |
2540 free_glyph_matrix (w->desired_matrix); | |
2541 w->current_matrix = w->desired_matrix = NULL; | |
2542 } | |
2543 | |
2544 /* Next window on same level. */ | |
2545 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
2546 } | |
2547 } | |
2548 | |
2549 | |
2550 /* Check glyph memory leaks. This function is called from | |
2551 shut_down_emacs. Note that frames are not destroyed when Emacs | |
2552 exits. We therefore free all glyph memory for all active frames | |
2553 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
|
2554 |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2555 void |
25012 | 2556 check_glyph_memory () |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2557 { |
25012 | 2558 Lisp_Object tail, frame; |
2559 | |
2560 /* Free glyph memory for all frames. */ | |
2561 FOR_EACH_FRAME (tail, frame) | |
2562 free_glyphs (XFRAME (frame)); | |
2563 | |
2564 /* Check that nothing is left allocated. */ | |
2565 if (glyph_matrix_count) | |
2566 abort (); | |
2567 if (glyph_pool_count) | |
2568 abort (); | |
2569 } | |
2570 | |
2571 | |
2572 | |
2573 /********************************************************************** | |
2574 Building a Frame Matrix | |
2575 **********************************************************************/ | |
2576 | |
2577 /* Most of the redisplay code works on glyph matrices attached to | |
2578 windows. This is a good solution most of the time, but it is not | |
2579 suitable for terminal code. Terminal output functions cannot rely | |
2580 on being able to set an arbitrary terminal window. Instead they | |
2581 must be provided with a view of the whole frame, i.e. the whole | |
2582 screen. We build such a view by constructing a frame matrix from | |
2583 window matrices in this section. | |
2584 | |
2585 Windows that must be updated have their must_be_update_p flag set. | |
2586 For all such windows, their desired matrix is made part of the | |
2587 desired frame matrix. For other windows, their current matrix is | |
2588 made part of the desired frame matrix. | |
2589 | |
2590 +-----------------+----------------+ | |
2591 | desired | desired | | |
2592 | | | | |
2593 +-----------------+----------------+ | |
2594 | current | | |
2595 | | | |
2596 +----------------------------------+ | |
2597 | |
2598 Desired window matrices can be made part of the frame matrix in a | |
2599 cheap way: We exploit the fact that the desired frame matrix and | |
2600 desired window matrices share their glyph memory. This is not | |
2601 possible for current window matrices. Their glyphs are copied to | |
2602 the desired frame matrix. The latter is equivalent to | |
2603 preserve_other_columns in the old redisplay. | |
2604 | |
2605 Used glyphs counters for frame matrix rows are the result of adding | |
2606 up glyph lengths of the window matrices. A line in the frame | |
2607 matrix is enabled, if a corresponding line in a window matrix is | |
2608 enabled. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2609 |
25012 | 2610 After building the desired frame matrix, it will be passed to |
2611 terminal code, which will manipulate both the desired and current | |
2612 frame matrix. Changes applied to the frame's current matrix have | |
2613 to be visible in current window matrices afterwards, of course. | |
2614 | |
2615 This problem is solved like this: | |
2616 | |
2617 1. Window and frame matrices share glyphs. Window matrices are | |
2618 constructed in a way that their glyph contents ARE the glyph | |
2619 contents needed in a frame matrix. Thus, any modification of | |
2620 glyphs done in terminal code will be reflected in window matrices | |
2621 automatically. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2622 |
25012 | 2623 2. Exchanges of rows in a frame matrix done by terminal code are |
2624 intercepted by hook functions so that corresponding row operations | |
2625 on window matrices can be performed. This is necessary because we | |
2626 use pointers to glyphs in glyph row structures. To satisfy the | |
2627 assumption of point 1 above that glyphs are updated implicitly in | |
2628 window matrices when they are manipulated via the frame matrix, | |
2629 window and frame matrix must of course agree where to find the | |
2630 glyphs for their rows. Possible manipulations that must be | |
2631 mirrored are assignments of rows of the desired frame matrix to the | |
2632 current frame matrix and scrolling the current frame matrix. */ | |
2633 | |
2634 /* Build frame F's desired matrix from window matrices. Only windows | |
2635 which have the flag must_be_updated_p set have to be updated. Menu | |
2636 bar lines of a frame are not covered by window matrices, so make | |
2637 sure not to touch them in this function. */ | |
2638 | |
2639 static void | |
2640 build_frame_matrix (f) | |
2641 struct frame *f; | |
2642 { | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2643 int i; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2644 |
25012 | 2645 /* F must have a frame matrix when this function is called. */ |
2646 xassert (!FRAME_WINDOW_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2647 |
25012 | 2648 /* Clear all rows in the frame matrix covered by window matrices. |
2649 Menu bar lines are not covered by windows. */ | |
2650 for (i = FRAME_TOP_MARGIN (f); i < f->desired_matrix->nrows; ++i) | |
2651 clear_glyph_row (MATRIX_ROW (f->desired_matrix, i)); | |
2652 | |
2653 /* Build the matrix by walking the window tree. */ | |
2654 build_frame_matrix_from_window_tree (f->desired_matrix, | |
2655 XWINDOW (FRAME_ROOT_WINDOW (f))); | |
2656 } | |
2657 | |
2658 | |
2659 /* Walk a window tree, building a frame matrix MATRIX from window | |
2660 matrices. W is the root of a window tree. */ | |
2661 | |
2662 static void | |
2663 build_frame_matrix_from_window_tree (matrix, w) | |
2664 struct glyph_matrix *matrix; | |
2665 struct window *w; | |
2666 { | |
2667 while (w) | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2668 { |
25012 | 2669 if (!NILP (w->hchild)) |
2670 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->hchild)); | |
2671 else if (!NILP (w->vchild)) | |
2672 build_frame_matrix_from_window_tree (matrix, XWINDOW (w->vchild)); | |
2673 else | |
2674 build_frame_matrix_from_leaf_window (matrix, w); | |
2675 | |
2676 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
|
2677 } |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
2678 } |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2679 |
25012 | 2680 |
2681 /* Add a window's matrix to a frame matrix. FRAME_MATRIX is the | |
2682 desired frame matrix built. W is a leaf window whose desired or | |
2683 current matrix is to be added to FRAME_MATRIX. W's flag | |
2684 must_be_updated_p determines which matrix it contributes to | |
2685 FRAME_MATRIX. If must_be_updated_p is non-zero, W's desired matrix | |
2686 is added to FRAME_MATRIX, otherwise W's current matrix is added. | |
2687 Adding a desired matrix means setting up used counters and such in | |
2688 frame rows, while adding a current window matrix to FRAME_MATRIX | |
2689 means copying glyphs. The latter case corresponds to | |
2690 preserve_other_columns in the old redisplay. */ | |
2691 | |
2692 static void | |
2693 build_frame_matrix_from_leaf_window (frame_matrix, w) | |
2694 struct glyph_matrix *frame_matrix; | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2695 struct window *w; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2696 { |
25012 | 2697 struct glyph_matrix *window_matrix; |
2698 int window_y, frame_y; | |
2699 /* If non-zero, a glyph to insert at the right border of W. */ | |
2700 GLYPH right_border_glyph = 0; | |
2701 | |
2702 /* Set window_matrix to the matrix we have to add to FRAME_MATRIX. */ | |
2703 if (w->must_be_updated_p) | |
2704 { | |
2705 window_matrix = w->desired_matrix; | |
2706 | |
2707 /* Decide whether we want to add a vertical border glyph. */ | |
2708 if (!WINDOW_RIGHTMOST_P (w)) | |
2709 { | |
2710 struct Lisp_Char_Table *dp = window_display_table (w); | |
2711 right_border_glyph = (dp && INTEGERP (DISP_BORDER_GLYPH (dp)) | |
2712 ? XINT (DISP_BORDER_GLYPH (dp)) | |
2713 : '|'); | |
2714 } | |
2715 } | |
2716 else | |
2717 window_matrix = w->current_matrix; | |
2718 | |
2719 /* For all rows in the window matrix and corresponding rows in the | |
2720 frame matrix. */ | |
2721 window_y = 0; | |
2722 frame_y = window_matrix->matrix_y; | |
2723 while (window_y < window_matrix->nrows) | |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2724 { |
25012 | 2725 struct glyph_row *frame_row = frame_matrix->rows + frame_y; |
2726 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
|
2727 int current_row_p = window_matrix == w->current_matrix; |
25012 | 2728 |
2729 /* Fill up the frame row with spaces up to the left margin of the | |
2730 window row. */ | |
2731 fill_up_frame_row_with_spaces (frame_row, window_matrix->matrix_x); | |
2732 | |
2733 /* Fill up areas in the window matrix row with spaces. */ | |
2734 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
|
2735 |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2736 /* 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
|
2737 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
|
2738 row instead. */ |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2739 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
|
2740 && !window_row->enabled_p) |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2741 { |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2742 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
|
2743 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
|
2744 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2745 |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2746 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
|
2747 { |
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2748 /* Copy window row to frame row. */ |
25012 | 2749 bcopy (window_row->glyphs[0], |
2750 frame_row->glyphs[TEXT_AREA] + window_matrix->matrix_x, | |
2751 window_matrix->matrix_w * sizeof (struct glyph)); | |
2752 } | |
2753 else | |
2754 { | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2755 xassert (window_row->enabled_p); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2756 |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
2757 /* 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
|
2758 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
|
2759 frame_row->enabled_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2760 |
25012 | 2761 /* Maybe insert a vertical border between horizontally adjacent |
2762 windows. */ | |
2763 if (right_border_glyph) | |
2764 { | |
2765 struct glyph *border = window_row->glyphs[LAST_AREA] - 1; | |
2766 SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph); | |
2767 } | |
2768 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
2769 /* 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
|
2770 frame_y. */ |
25012 | 2771 xassert (glyph_row_slice_p (window_row, frame_row)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2772 |
25012 | 2773 /* If rows are in sync, we don't have to copy glyphs because |
2774 frame and window share glyphs. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2775 |
25241
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2776 #if GLYPH_DEBUG |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2777 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
|
2778 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
|
2779 #endif |
25012 | 2780 } |
2781 | |
2782 /* Set number of used glyphs in the frame matrix. Since we fill | |
2783 up with spaces, and visit leaf windows from left to right it | |
2784 can be done simply. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2785 frame_row->used[TEXT_AREA] |
25012 | 2786 = window_matrix->matrix_x + window_matrix->matrix_w; |
2787 | |
2788 /* Next row. */ | |
2789 ++window_y; | |
2790 ++frame_y; | |
2791 } | |
2792 } | |
2793 | |
2794 | |
2795 /* Add spaces to a glyph row ROW in a window matrix. | |
2796 | |
2797 Each row has the form: | |
2798 | |
2799 +---------+-----------------------------+------------+ | |
2800 | left | text | right | | |
2801 +---------+-----------------------------+------------+ | |
2802 | |
2803 Left and right marginal areas are optional. This function adds | |
2804 spaces to areas so that there are no empty holes between areas. | |
2805 In other words: If the right area is not empty, the text area | |
2806 is filled up with spaces up to the right area. If the text area | |
2807 is not empty, the left area is filled up. | |
2808 | |
2809 To be called for frame-based redisplay, only. */ | |
2810 | |
2811 static void | |
2812 fill_up_glyph_row_with_spaces (row) | |
2813 struct glyph_row *row; | |
2814 { | |
2815 fill_up_glyph_row_area_with_spaces (row, LEFT_MARGIN_AREA); | |
2816 fill_up_glyph_row_area_with_spaces (row, TEXT_AREA); | |
2817 fill_up_glyph_row_area_with_spaces (row, RIGHT_MARGIN_AREA); | |
2818 } | |
2819 | |
2820 | |
2821 /* Fill area AREA of glyph row ROW with spaces. To be called for | |
2822 frame-based redisplay only. */ | |
2823 | |
2824 static void | |
2825 fill_up_glyph_row_area_with_spaces (row, area) | |
2826 struct glyph_row *row; | |
2827 int area; | |
2828 { | |
2829 if (row->glyphs[area] < row->glyphs[area + 1]) | |
2830 { | |
2831 struct glyph *end = row->glyphs[area + 1]; | |
2832 struct glyph *text = row->glyphs[area] + row->used[area]; | |
2833 | |
2834 while (text < end) | |
2835 *text++ = space_glyph; | |
2836 row->used[area] = text - row->glyphs[area]; | |
2837 } | |
2838 } | |
2839 | |
2840 | |
2841 /* Add spaces to the end of ROW in a frame matrix until index UPTO is | |
2842 reached. In frame matrices only one area, TEXT_AREA, is used. */ | |
2843 | |
2844 static void | |
2845 fill_up_frame_row_with_spaces (row, upto) | |
2846 struct glyph_row *row; | |
2847 int upto; | |
2848 { | |
2849 int i = row->used[TEXT_AREA]; | |
2850 struct glyph *glyph = row->glyphs[TEXT_AREA]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2851 |
25012 | 2852 while (i < upto) |
2853 glyph[i++] = space_glyph; | |
2854 | |
2855 row->used[TEXT_AREA] = i; | |
2856 } | |
2857 | |
2858 | |
2859 | |
2860 /********************************************************************** | |
2861 Mirroring operations on frame matrices in window matrices | |
2862 **********************************************************************/ | |
2863 | |
2864 /* Set frame being updated via frame-based redisplay to F. This | |
2865 function must be called before updates to make explicit that we are | |
2866 working on frame matrices or not. */ | |
2867 | |
2868 static INLINE void | |
2869 set_frame_matrix_frame (f) | |
2870 struct frame *f; | |
2871 { | |
2872 frame_matrix_frame = f; | |
2873 } | |
2874 | |
2875 | |
2876 /* Make sure glyph row ROW in CURRENT_MATRIX is up to date. | |
2877 DESIRED_MATRIX is the desired matrix corresponding to | |
2878 CURRENT_MATRIX. The update is done by exchanging glyph pointers | |
2879 between rows in CURRENT_MATRIX and DESIRED_MATRIX. If | |
2880 frame_matrix_frame is non-null, this indicates that the exchange is | |
2881 done in frame matrices, and that we have to perform analogous | |
2882 operations in window matrices of frame_matrix_frame. */ | |
2883 | |
2884 static INLINE void | |
2885 make_current (desired_matrix, current_matrix, row) | |
2886 struct glyph_matrix *desired_matrix, *current_matrix; | |
2887 int row; | |
2888 { | |
2889 struct glyph_row *current_row = MATRIX_ROW (current_matrix, row); | |
2890 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
|
2891 int mouse_face_p = current_row->mouse_face_p; |
25012 | 2892 |
2893 /* Do current_row = desired_row. This exchanges glyph pointers | |
2894 between both rows, and does a structure assignment otherwise. */ | |
2895 assign_row (current_row, desired_row); | |
2896 | |
2897 /* Enable current_row to mark it as valid. */ | |
2898 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
|
2899 current_row->mouse_face_p = mouse_face_p; |
25012 | 2900 |
2901 /* If we are called on frame matrices, perform analogous operations | |
2902 for window matrices. */ | |
2903 if (frame_matrix_frame) | |
2904 mirror_make_current (XWINDOW (frame_matrix_frame->root_window), row); | |
2905 } | |
2906 | |
2907 | |
2908 /* W is the root of a window tree. FRAME_ROW is the index of a row in | |
2909 W's frame which has been made current (by swapping pointers between | |
2910 current and desired matrix). Perform analogous operations in the | |
2911 matrices of leaf windows in the window tree rooted at W. */ | |
2912 | |
2913 static void | |
2914 mirror_make_current (w, frame_row) | |
2915 struct window *w; | |
2916 int frame_row; | |
2917 { | |
2918 while (w) | |
2919 { | |
2920 if (!NILP (w->hchild)) | |
2921 mirror_make_current (XWINDOW (w->hchild), frame_row); | |
2922 else if (!NILP (w->vchild)) | |
2923 mirror_make_current (XWINDOW (w->vchild), frame_row); | |
2924 else | |
2925 { | |
2926 /* Row relative to window W. Don't use FRAME_TO_WINDOW_VPOS | |
2927 here because the checks performed in debug mode there | |
2928 will not allow the conversion. */ | |
2929 int row = frame_row - w->desired_matrix->matrix_y; | |
2930 | |
2931 /* If FRAME_ROW is within W, assign the desired row to the | |
2932 current row (exchanging glyph pointers). */ | |
2933 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
|
2934 { |
25012 | 2935 struct glyph_row *current_row |
2936 = MATRIX_ROW (w->current_matrix, row); | |
2937 struct glyph_row *desired_row | |
2938 = 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
|
2939 |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2940 if (desired_row->enabled_p) |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2941 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
|
2942 else |
35674d7c4136
(mirror_make_current): If desired row isn't enabled,
Gerd Moellmann <gerd@gnu.org>
parents:
25190
diff
changeset
|
2943 swap_glyph_pointers (desired_row, current_row); |
25012 | 2944 current_row->enabled_p = 1; |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2945 } |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
2946 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
2947 |
25012 | 2948 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2949 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
2950 } |
25012 | 2951 |
2952 | |
2953 /* Perform row dance after scrolling. We are working on the range of | |
2954 lines UNCHANGED_AT_TOP + 1 to UNCHANGED_AT_TOP + NLINES (not | |
2955 including) in MATRIX. COPY_FROM is a vector containing, for each | |
2956 row I in the range 0 <= I < NLINES, the index of the original line | |
2957 to move to I. This index is relative to the row range, i.e. 0 <= | |
2958 index < NLINES. RETAINED_P is a vector containing zero for each | |
2959 row 0 <= I < NLINES which is empty. | |
2960 | |
2961 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
|
2962 |
25012 | 2963 void |
2964 mirrored_line_dance (matrix, unchanged_at_top, nlines, copy_from, | |
2965 retained_p) | |
2966 struct glyph_matrix *matrix; | |
2967 int unchanged_at_top, nlines; | |
2968 int *copy_from; | |
2969 char *retained_p; | |
2970 { | |
2971 /* A copy of original rows. */ | |
2972 struct glyph_row *old_rows; | |
2973 | |
2974 /* Rows to assign to. */ | |
2975 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
|
2976 |
25012 | 2977 int i; |
2978 | |
2979 /* Make a copy of the original rows. */ | |
2980 old_rows = (struct glyph_row *) alloca (nlines * sizeof *old_rows); | |
2981 bcopy (new_rows, old_rows, nlines * sizeof *old_rows); | |
2982 | |
2983 /* Assign new rows, maybe clear lines. */ | |
2984 for (i = 0; i < nlines; ++i) | |
2985 { | |
2986 int enabled_before_p = new_rows[i].enabled_p; | |
2987 | |
2988 xassert (i + unchanged_at_top < matrix->nrows); | |
2989 xassert (unchanged_at_top + copy_from[i] < matrix->nrows); | |
2990 new_rows[i] = old_rows[copy_from[i]]; | |
2991 new_rows[i].enabled_p = enabled_before_p; | |
2992 | |
2993 /* RETAINED_P is zero for empty lines. */ | |
2994 if (!retained_p[copy_from[i]]) | |
2995 new_rows[i].enabled_p = 0; | |
2996 } | |
2997 | |
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
|
2998 /* Do the same for window matrices, if MATRIX is a frame matrix. */ |
25012 | 2999 if (frame_matrix_frame) |
3000 mirror_line_dance (XWINDOW (frame_matrix_frame->root_window), | |
3001 unchanged_at_top, nlines, copy_from, retained_p); | |
3002 } | |
3003 | |
3004 | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3005 /* 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
|
3006 the current frame matrix. */ |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3007 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3008 static void |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3009 sync_window_with_frame_matrix_rows (w) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3010 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3011 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3012 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3013 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
|
3014 int left, right, x, width; |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3015 |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3016 /* 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
|
3017 xassert (NILP (w->hchild) && NILP (w->vchild)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3018 xassert (!FRAME_WINDOW_P (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3019 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3020 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
|
3021 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
|
3022 x = w->current_matrix->matrix_x; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3023 width = w->current_matrix->matrix_w; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3024 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3025 window_row = w->current_matrix->rows; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3026 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
|
3027 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
|
3028 |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3029 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
|
3030 { |
40214
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3031 window_row->glyphs[LEFT_MARGIN_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3032 = frame_row->glyphs[0] + x; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3033 window_row->glyphs[TEXT_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3034 = window_row->glyphs[LEFT_MARGIN_AREA] + left; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3035 window_row->glyphs[LAST_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3036 = window_row->glyphs[LEFT_MARGIN_AREA] + width; |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3037 window_row->glyphs[RIGHT_MARGIN_AREA] |
a87bf217f5a6
(sync_window_with_frame_matrix_rows): Fix
Gerd Moellmann <gerd@gnu.org>
parents:
40075
diff
changeset
|
3038 = window_row->glyphs[LAST_AREA] - right; |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3039 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3040 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3041 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3042 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3043 /* 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
|
3044 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
|
3045 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3046 struct window * |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3047 frame_row_to_window (w, row) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3048 struct window *w; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3049 int row; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3050 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3051 struct window *found = NULL; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3052 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3053 while (w && !found) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3054 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3055 if (!NILP (w->hchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3056 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
|
3057 else if (!NILP (w->vchild)) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3058 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
|
3059 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
|
3060 && row < WINDOW_BOTTOM_EDGE_LINE (w)) |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3061 found = w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3062 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3063 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3064 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3065 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3066 return found; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3067 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3068 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3069 |
25012 | 3070 /* Perform a line dance in the window tree rooted at W, after |
3071 scrolling a frame matrix in mirrored_line_dance. | |
3072 | |
3073 We are working on the range of lines UNCHANGED_AT_TOP + 1 to | |
3074 UNCHANGED_AT_TOP + NLINES (not including) in W's frame matrix. | |
3075 COPY_FROM is a vector containing, for each row I in the range 0 <= | |
3076 I < NLINES, the index of the original line to move to I. This | |
3077 index is relative to the row range, i.e. 0 <= index < NLINES. | |
3078 RETAINED_P is a vector containing zero for each row 0 <= I < NLINES | |
3079 which is empty. */ | |
3080 | |
3081 static void | |
3082 mirror_line_dance (w, unchanged_at_top, nlines, copy_from, retained_p) | |
3083 struct window *w; | |
3084 int unchanged_at_top, nlines; | |
3085 int *copy_from; | |
3086 char *retained_p; | |
3087 { | |
3088 while (w) | |
3089 { | |
3090 if (!NILP (w->hchild)) | |
3091 mirror_line_dance (XWINDOW (w->hchild), unchanged_at_top, | |
3092 nlines, copy_from, retained_p); | |
3093 else if (!NILP (w->vchild)) | |
3094 mirror_line_dance (XWINDOW (w->vchild), unchanged_at_top, | |
3095 nlines, copy_from, retained_p); | |
3096 else | |
3097 { | |
3098 /* W is a leaf window, and we are working on its current | |
3099 matrix m. */ | |
3100 struct glyph_matrix *m = w->current_matrix; | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3101 int i, sync_p = 0; |
25012 | 3102 struct glyph_row *old_rows; |
3103 | |
3104 /* Make a copy of the original rows of matrix m. */ | |
3105 old_rows = (struct glyph_row *) alloca (m->nrows * sizeof *old_rows); | |
3106 bcopy (m->rows, old_rows, m->nrows * sizeof *old_rows); | |
3107 | |
3108 for (i = 0; i < nlines; ++i) | |
3109 { | |
3110 /* Frame relative line assigned to. */ | |
3111 int frame_to = i + unchanged_at_top; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3112 |
25012 | 3113 /* Frame relative line assigned. */ |
3114 int frame_from = copy_from[i] + unchanged_at_top; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3115 |
25012 | 3116 /* Window relative line assigned to. */ |
3117 int window_to = frame_to - m->matrix_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3118 |
25012 | 3119 /* Window relative line assigned. */ |
3120 int window_from = frame_from - m->matrix_y; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3121 |
25012 | 3122 /* Is assigned line inside window? */ |
3123 int from_inside_window_p | |
3124 = window_from >= 0 && window_from < m->matrix_h; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3125 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3126 /* Is assigned to line inside window? */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3127 int to_inside_window_p |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3128 = window_to >= 0 && window_to < m->matrix_h; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3129 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3130 if (from_inside_window_p && to_inside_window_p) |
25012 | 3131 { |
3132 /* Enabled setting before assignment. */ | |
3133 int enabled_before_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3134 |
25012 | 3135 /* Do the assignment. The enabled_p flag is saved |
3136 over the assignment because the old redisplay did | |
3137 that. */ | |
3138 enabled_before_p = m->rows[window_to].enabled_p; | |
3139 m->rows[window_to] = old_rows[window_from]; | |
3140 m->rows[window_to].enabled_p = enabled_before_p; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3141 |
25012 | 3142 /* If frame line is empty, window line is empty, too. */ |
3143 if (!retained_p[copy_from[i]]) | |
3144 m->rows[window_to].enabled_p = 0; | |
3145 } | |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3146 else if (to_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3147 { |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3148 /* A copy between windows. This is an infrequent |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3149 case not worth optimizing. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3150 struct frame *f = XFRAME (w->frame); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3151 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3152 struct window *w2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3153 struct glyph_matrix *m2; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3154 int m2_from; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3155 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3156 w2 = frame_row_to_window (root, frame_to); |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3157 m2 = w2->current_matrix; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3158 m2_from = frame_from - m2->matrix_y; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3159 copy_row_except_pointers (m->rows + window_to, |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3160 m2->rows + m2_from); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3161 |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3162 /* If frame line is empty, window line is empty, too. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3163 if (!retained_p[copy_from[i]]) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3164 m->rows[window_to].enabled_p = 0; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3165 sync_p = 1; |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3166 } |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3167 else if (from_inside_window_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3168 sync_p = 1; |
25012 | 3169 } |
27855
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3170 |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3171 /* 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
|
3172 pointers are in sync with the frame matrix. */ |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3173 if (sync_p) |
ecfe912fd73c
(flush_stdout) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27727
diff
changeset
|
3174 sync_window_with_frame_matrix_rows (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3175 |
25012 | 3176 /* Check that no pointers are lost. */ |
3177 CHECK_MATRIX (m); | |
3178 } | |
3179 | |
3180 /* Next window on same level. */ | |
3181 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3182 } | |
3183 } | |
3184 | |
3185 | |
3186 #if GLYPH_DEBUG | |
3187 | |
3188 /* Check that window and frame matrices agree about their | |
3189 understanding where glyphs of the rows are to find. For each | |
3190 window in the window tree rooted at W, check that rows in the | |
3191 matrices of leaf window agree with their frame matrices about | |
3192 glyph pointers. */ | |
314 | 3193 |
21514 | 3194 void |
25012 | 3195 check_window_matrix_pointers (w) |
314 | 3196 struct window *w; |
3197 { | |
25012 | 3198 while (w) |
3199 { | |
3200 if (!NILP (w->hchild)) | |
3201 check_window_matrix_pointers (XWINDOW (w->hchild)); | |
3202 else if (!NILP (w->vchild)) | |
3203 check_window_matrix_pointers (XWINDOW (w->vchild)); | |
3204 else | |
3205 { | |
3206 struct frame *f = XFRAME (w->frame); | |
3207 check_matrix_pointers (w->desired_matrix, f->desired_matrix); | |
3208 check_matrix_pointers (w->current_matrix, f->current_matrix); | |
3209 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3210 |
25012 | 3211 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
3212 } | |
3213 } | |
3214 | |
3215 | |
3216 /* Check that window rows are slices of frame rows. WINDOW_MATRIX is | |
3217 a window and FRAME_MATRIX is the corresponding frame matrix. For | |
3218 each row in WINDOW_MATRIX check that it's a slice of the | |
3219 corresponding frame row. If it isn't, abort. */ | |
3220 | |
3221 static void | |
3222 check_matrix_pointers (window_matrix, frame_matrix) | |
3223 struct glyph_matrix *window_matrix, *frame_matrix; | |
3224 { | |
3225 /* Row number in WINDOW_MATRIX. */ | |
3226 int i = 0; | |
3227 | |
3228 /* Row number corresponding to I in FRAME_MATRIX. */ | |
3229 int j = window_matrix->matrix_y; | |
3230 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3231 /* For all rows check that the row in the window matrix is a |
25012 | 3232 slice of the row in the frame matrix. If it isn't we didn't |
3233 mirror an operation on the frame matrix correctly. */ | |
3234 while (i < window_matrix->nrows) | |
3235 { | |
3236 if (!glyph_row_slice_p (window_matrix->rows + i, | |
3237 frame_matrix->rows + j)) | |
3238 abort (); | |
3239 ++i, ++j; | |
3240 } | |
3241 } | |
3242 | |
3243 #endif /* GLYPH_DEBUG != 0 */ | |
3244 | |
3245 | |
3246 | |
3247 /********************************************************************** | |
3248 VPOS and HPOS translations | |
3249 **********************************************************************/ | |
3250 | |
3251 #if GLYPH_DEBUG | |
3252 | |
3253 /* Translate vertical position VPOS which is relative to window W to a | |
3254 vertical position relative to W's frame. */ | |
3255 | |
3256 static int | |
3257 window_to_frame_vpos (w, vpos) | |
3258 struct window *w; | |
3259 int vpos; | |
3260 { | |
3261 struct frame *f = XFRAME (w->frame); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3262 |
25012 | 3263 xassert (!FRAME_WINDOW_P (f)); |
3264 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
|
3265 vpos += WINDOW_TOP_EDGE_LINE (w); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3266 xassert (vpos >= 0 && vpos <= FRAME_LINES (f)); |
25012 | 3267 return vpos; |
3268 } | |
3269 | |
3270 | |
3271 /* 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
|
3272 a horizontal position relative to W's frame. */ |
25012 | 3273 |
3274 static int | |
3275 window_to_frame_hpos (w, hpos) | |
3276 struct window *w; | |
3277 int hpos; | |
3278 { | |
3279 struct frame *f = XFRAME (w->frame); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3280 |
25012 | 3281 xassert (!FRAME_WINDOW_P (f)); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3282 hpos += WINDOW_LEFT_EDGE_COL (w); |
25012 | 3283 return hpos; |
314 | 3284 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3285 |
25012 | 3286 #endif /* GLYPH_DEBUG */ |
3287 | |
3288 | |
314 | 3289 |
25012 | 3290 /********************************************************************** |
3291 Redrawing Frames | |
3292 **********************************************************************/ | |
3293 | |
3294 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
|
3295 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
|
3296 (frame) |
25012 | 3297 Lisp_Object frame; |
3298 { | |
3299 struct frame *f; | |
3300 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
3301 CHECK_LIVE_FRAME (frame); |
25012 | 3302 f = XFRAME (frame); |
3303 | |
3304 /* Ignore redraw requests, if frame has no glyphs yet. | |
3305 (Implementation note: It still has to be checked why we are | |
3306 called so early here). */ | |
3307 if (!glyphs_initialized_initially_p) | |
3308 return Qnil; | |
3309 | |
3310 update_begin (f); | |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3311 #ifdef MSDOS |
35445
9af454aee182
(Fredraw_frame): Remove reference to
Andrew Innes <andrewi@gnu.org>
parents:
35374
diff
changeset
|
3312 if (FRAME_MSDOS_P (f)) |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3313 set_terminal_modes (FRAME_DISPLAY (f)); |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3314 #endif |
25012 | 3315 clear_frame (); |
3316 clear_current_matrices (f); | |
3317 update_end (f); | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3318 if (FRAME_TERMCAP_P (f)) |
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3319 fflush (TTY_OUTPUT (FRAME_TTY (f))); |
25012 | 3320 windows_or_buffers_changed++; |
3321 /* Mark all windows as inaccurate, so that every window will have | |
3322 its redisplay done. */ | |
3323 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0); | |
3324 set_window_update_flags (XWINDOW (FRAME_ROOT_WINDOW (f)), 1); | |
3325 f->garbaged = 0; | |
3326 return Qnil; | |
3327 } | |
3328 | |
3329 | |
3330 /* Redraw frame F. This is nothing more than a call to the Lisp | |
3331 function redraw-frame. */ | |
3332 | |
3333 void | |
3334 redraw_frame (f) | |
3335 struct frame *f; | |
3336 { | |
3337 Lisp_Object frame; | |
3338 XSETFRAME (frame, f); | |
3339 Fredraw_frame (frame); | |
3340 } | |
3341 | |
3342 | |
3343 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
|
3344 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
|
3345 () |
25012 | 3346 { |
3347 Lisp_Object tail, frame; | |
3348 | |
3349 FOR_EACH_FRAME (tail, frame) | |
3350 if (FRAME_VISIBLE_P (XFRAME (frame))) | |
3351 Fredraw_frame (frame); | |
3352 | |
3353 return Qnil; | |
3354 } | |
3355 | |
3356 | |
3357 /* This is used when frame_garbaged is set. Call Fredraw_frame on all | |
3358 visible frames marked as garbaged. */ | |
3359 | |
3360 void | |
3361 redraw_garbaged_frames () | |
3362 { | |
3363 Lisp_Object tail, frame; | |
3364 | |
3365 FOR_EACH_FRAME (tail, frame) | |
3366 if (FRAME_VISIBLE_P (XFRAME (frame)) | |
3367 && FRAME_GARBAGED_P (XFRAME (frame))) | |
3368 Fredraw_frame (frame); | |
3369 } | |
3370 | |
3371 | |
3372 | |
3373 /*********************************************************************** | |
3374 Direct Operations | |
3375 ***********************************************************************/ | |
3376 | |
3377 /* Try to update display and current glyph matrix directly. | |
3378 | |
3379 This function is called after a character G has been inserted into | |
3380 current_buffer. It tries to update the current glyph matrix and | |
3381 perform appropriate screen output to reflect the insertion. If it | |
3382 succeeds, the global flag redisplay_performed_directly_p will be | |
3383 set to 1, and thereby prevent the more costly general redisplay | |
3384 from running (see redisplay_internal). | |
3385 | |
3386 This function is not called for `hairy' character insertions. | |
3387 In particular, it is not called when after or before change | |
3388 functions exist, like they are used by font-lock. See keyboard.c | |
3389 for details where this function is called. */ | |
314 | 3390 |
3391 int | |
3392 direct_output_for_insert (g) | |
3393 int g; | |
3394 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3395 register struct frame *f = SELECTED_FRAME (); |
25012 | 3396 struct window *w = XWINDOW (selected_window); |
3397 struct it it, it2; | |
3398 struct glyph_row *glyph_row; | |
3399 struct glyph *glyphs, *glyph, *end; | |
3400 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
|
3401 /* Non-null means that redisplay of W is based on window matrices. */ |
25012 | 3402 int window_redisplay_p = FRAME_WINDOW_P (f); |
3403 /* Non-null means we are in overwrite mode. */ | |
3404 int overwrite_p = !NILP (current_buffer->overwrite_mode); | |
3405 int added_width; | |
3406 struct text_pos pos; | |
3407 int delta, delta_bytes; | |
3408 | |
3409 /* Not done directly. */ | |
3410 redisplay_performed_directly_p = 0; | |
3411 | |
3412 /* Quickly give up for some common cases. */ | |
3413 if (cursor_in_echo_area | |
3414 /* Give up if fonts have changed. */ | |
3415 || fonts_changed_p | |
3416 /* Give up if face attributes have been changed. */ | |
3417 || face_change_count | |
3418 /* Give up if cursor position not really known. */ | |
314 | 3419 || !display_completed |
25012 | 3420 /* Give up if buffer appears in two places. */ |
314 | 3421 || buffer_shared > 1 |
34715
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3422 /* 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
|
3423 minibuffer contents. */ |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3424 || (EQ (selected_window, minibuf_window) |
fc3693bea815
(direct_output_for_insert): Fix check for mini-window
Gerd Moellmann <gerd@gnu.org>
parents:
34622
diff
changeset
|
3425 && EQ (minibuf_window, echo_area_window)) |
25012 | 3426 /* Give up for hscrolled mini-buffer because display of the prompt |
3427 is handled specially there (see display_line). */ | |
3428 || (MINI_WINDOW_P (w) && XFASTINT (w->hscroll)) | |
3429 /* Give up if overwriting in the middle of a line. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3430 || (overwrite_p |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3431 && PT != ZV |
25012 | 3432 && FETCH_BYTE (PT) != '\n') |
3433 /* Give up for tabs and line ends. */ | |
3434 || g == '\t' | |
3435 || g == '\n' | |
3436 || g == '\r' | |
3437 /* Give up if unable to display the cursor in the window. */ | |
3438 || 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
|
3439 /* 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
|
3440 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
|
3441 || !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
|
3442 || !NILP (echo_area_buffer[1]) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3443 || (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
|
3444 /* 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
|
3445 lines would change. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3446 (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
|
3447 || 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
|
3448 /* 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
|
3449 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
|
3450 have to be redisplayed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3451 || glyph_row->overlapping_p |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3452 || glyph_row->overlapped_p)) |
25012 | 3453 /* Can't do it for partial width windows on terminal frames |
3454 because we can't clear to eol in such a window. */ | |
3455 || (!window_redisplay_p && !WINDOW_FULL_WIDTH_P (w))) | |
3456 return 0; | |
3457 | |
35374
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3458 /* 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
|
3459 at the end of a line. */ |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3460 if (!FRAME_CHAR_INS_DEL_OK (f)) |
35374
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3461 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
|
3462 return 0; |
3fc8f4c6ed56
(direct_output_for_insert): If char_ins_del_ok is
Gerd Moellmann <gerd@gnu.org>
parents:
35336
diff
changeset
|
3463 |
25012 | 3464 /* Set up a display iterator structure for W. Glyphs will be |
3465 produced in scratch_glyph_row. Current position is W's cursor | |
3466 position. */ | |
3467 clear_glyph_row (&scratch_glyph_row); | |
3468 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
|
3469 DEC_TEXT_POS (pos, !NILP (current_buffer->enable_multibyte_characters)); |
25012 | 3470 init_iterator (&it, w, CHARPOS (pos), BYTEPOS (pos), &scratch_glyph_row, |
3471 DEFAULT_FACE_ID); | |
3472 | |
3473 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
|
3474 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
|
3475 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3476 |
25012 | 3477 /* Give up if highlighting trailing whitespace and we have trailing |
3478 whitespace in glyph_row. We would have to remove the trailing | |
3479 whitespace face in that case. */ | |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3480 if (!NILP (Vshow_trailing_whitespace) |
25012 | 3481 && glyph_row->used[TEXT_AREA]) |
3482 { | |
3483 struct glyph *last; | |
3484 | |
3485 last = glyph_row->glyphs[TEXT_AREA] + glyph_row->used[TEXT_AREA] - 1; | |
3486 if (last->type == STRETCH_GLYPH | |
3487 || (last->type == CHAR_GLYPH | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
3488 && last->u.ch == ' ')) |
25012 | 3489 return 0; |
3490 } | |
3491 | |
3492 /* Give up if there are overlay strings at pos. This would fail | |
3493 if the overlay string has newlines in it. */ | |
3494 if (STRINGP (it.string)) | |
3495 return 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3496 |
25012 | 3497 it.hpos = w->cursor.hpos; |
3498 it.vpos = w->cursor.vpos; | |
3499 it.current_x = w->cursor.x + it.first_visible_x; | |
3500 it.current_y = w->cursor.y; | |
3501 it.end_charpos = PT; | |
3502 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
|
3503 it.stop_charpos = max (IT_CHARPOS (it), it.stop_charpos); |
25012 | 3504 |
3505 /* More than one display element may be returned for PT - 1 if | |
3506 (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
|
3507 `^C', or (ii) it has a display table entry, or (iii) it's a |
25012 | 3508 combination of both. */ |
3509 delta = delta_bytes = 0; | |
3510 while (get_next_display_element (&it)) | |
3511 { | |
3512 PRODUCE_GLYPHS (&it); | |
3513 | |
3514 /* Give up if glyph doesn't fit completely on the line. */ | |
3515 if (it.current_x >= it.last_visible_x) | |
3516 return 0; | |
3517 | |
3518 /* Give up if new glyph has different ascent or descent than | |
3519 the original row, or if it is not a character glyph. */ | |
3520 if (glyph_row->ascent != it.ascent | |
3521 || 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
|
3522 || glyph_row->phys_ascent != it.phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3523 || glyph_row->phys_height != it.phys_ascent + it.phys_descent |
25012 | 3524 || it.what != IT_CHARACTER) |
3525 return 0; | |
3526 | |
3527 delta += 1; | |
3528 delta_bytes += it.len; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3529 set_iterator_to_next (&it, 1); |
25012 | 3530 } |
3531 | |
3532 /* Give up if we hit the right edge of the window. We would have | |
3533 to insert truncation or continuation glyphs. */ | |
3534 added_width = it.current_x - (w->cursor.x + it.first_visible_x); | |
3535 if (glyph_row->pixel_width + added_width >= it.last_visible_x) | |
314 | 3536 return 0; |
3537 | |
25012 | 3538 /* Give up if there is a \t following in the line. */ |
3539 it2 = it; | |
3540 it2.end_charpos = ZV; | |
3541 it2.stop_charpos = min (it2.stop_charpos, ZV); | |
3542 while (get_next_display_element (&it2) | |
3543 && !ITERATOR_AT_END_OF_LINE_P (&it2)) | |
3544 { | |
3545 if (it2.c == '\t') | |
3546 return 0; | |
32468
20788c8274cd
(direct_output_for_insert): Call set_iterator_to_next
Gerd Moellmann <gerd@gnu.org>
parents:
31932
diff
changeset
|
3547 set_iterator_to_next (&it2, 1); |
25012 | 3548 } |
3549 | |
3550 /* Number of new glyphs produced. */ | |
3551 n = it.glyph_row->used[TEXT_AREA]; | |
3552 | |
3553 /* Start and end of glyphs in original row. */ | |
3554 glyphs = glyph_row->glyphs[TEXT_AREA] + w->cursor.hpos; | |
3555 end = glyph_row->glyphs[1 + TEXT_AREA]; | |
3556 | |
3557 /* Make room for new glyphs, then insert them. */ | |
3558 xassert (end - glyphs - n >= 0); | |
25781
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3559 safe_bcopy ((char *) glyphs, (char *) (glyphs + n), |
e5579bc77d9e
(direct_output_for_insert): Cast arguments to
Gerd Moellmann <gerd@gnu.org>
parents:
25735
diff
changeset
|
3560 (end - glyphs - n) * sizeof (*end)); |
25012 | 3561 bcopy (it.glyph_row->glyphs[TEXT_AREA], glyphs, n * sizeof *glyphs); |
3562 glyph_row->used[TEXT_AREA] = min (glyph_row->used[TEXT_AREA] + n, | |
3563 end - glyph_row->glyphs[TEXT_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3564 |
25012 | 3565 /* Compute new line width. */ |
3566 glyph = glyph_row->glyphs[TEXT_AREA]; | |
3567 end = glyph + glyph_row->used[TEXT_AREA]; | |
3568 glyph_row->pixel_width = glyph_row->x; | |
3569 while (glyph < end) | |
3570 { | |
3571 glyph_row->pixel_width += glyph->pixel_width; | |
3572 ++glyph; | |
3573 } | |
3574 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3575 /* Increment buffer positions for glyphs following the newly |
25012 | 3576 inserted ones. */ |
3577 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
|
3578 if (glyph->charpos > 0 && BUFFERP (glyph->object)) |
25012 | 3579 glyph->charpos += delta; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3580 |
25012 | 3581 if (MATRIX_ROW_END_CHARPOS (glyph_row) > 0) |
3582 { | |
3583 MATRIX_ROW_END_CHARPOS (glyph_row) += delta; | |
3584 MATRIX_ROW_END_BYTEPOS (glyph_row) += delta_bytes; | |
3585 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3586 |
25012 | 3587 /* 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
|
3588 increment_matrix_positions (w->current_matrix, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3589 w->cursor.vpos + 1, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3590 w->current_matrix->nrows, |
4e2497e6757e
(increment_matrix_positions): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents:
28682
diff
changeset
|
3591 delta, delta_bytes); |
25012 | 3592 |
3593 glyph_row->contains_overlapping_glyphs_p | |
3594 |= it.glyph_row->contains_overlapping_glyphs_p; | |
3595 | |
26591
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3596 glyph_row->displays_text_p = 1; |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3597 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
|
3598 XFASTINT (w->window_end_vpos))); |
f7c7ef351f04
(direct_output_for_insert): Set glyph row's
Gerd Moellmann <gerd@gnu.org>
parents:
26546
diff
changeset
|
3599 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3600 if (!NILP (Vshow_trailing_whitespace)) |
25012 | 3601 highlight_trailing_whitespace (it.f, glyph_row); |
3602 | |
3603 /* Write glyphs. If at end of row, we can simply call write_glyphs. | |
3604 In the middle, we have to insert glyphs. Note that this is now | |
3605 implemented for X frames. The implementation uses updated_window | |
3606 and updated_row. */ | |
3607 updated_row = glyph_row; | |
38988
53ae5a92e2fc
(direct_output_for_insert): Set updated_area
Gerd Moellmann <gerd@gnu.org>
parents:
38748
diff
changeset
|
3608 updated_area = TEXT_AREA; |
25012 | 3609 update_begin (f); |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3610 if (FRAME_RIF (f)) |
25012 | 3611 { |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3612 FRAME_RIF (f)->update_window_begin_hook (w); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3613 |
36115
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3614 if (glyphs == end - n |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3615 /* 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
|
3616 || (glyphs == end - n - 1 |
c0fac212cfcc
(direct_output_for_insert): Recognize more cases where
Gerd Moellmann <gerd@gnu.org>
parents:
36097
diff
changeset
|
3617 && (end - n)->charpos <= 0)) |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3618 FRAME_RIF (f)->write_glyphs (glyphs, n); |
25012 | 3619 else |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3620 FRAME_RIF (f)->insert_glyphs (glyphs, n); |
25012 | 3621 } |
3622 else | |
3623 { | |
3624 if (glyphs == end - n) | |
3625 write_glyphs (glyphs, n); | |
3626 else | |
3627 insert_glyphs (glyphs, n); | |
3628 } | |
3629 | |
3630 w->cursor.hpos += n; | |
3631 w->cursor.x = it.current_x - it.first_visible_x; | |
3632 xassert (w->cursor.hpos >= 0 | |
3633 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
3634 | |
3635 /* How to set the cursor differs depending on whether we are | |
3636 using a frame matrix or a window matrix. Note that when | |
3637 a frame matrix is used, cursor_to expects frame coordinates, | |
3638 and the X and Y parameters are not used. */ | |
3639 if (window_redisplay_p) | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3640 FRAME_RIF (f)->cursor_to (w->cursor.vpos, w->cursor.hpos, |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3641 w->cursor.y, w->cursor.x); |
25012 | 3642 else |
3643 { | |
3644 int x, y; | |
3645 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
|
3646 + (INTEGERP (w->left_margin_cols) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3647 ? XFASTINT (w->left_margin_cols) |
25012 | 3648 : 0)); |
3649 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
3650 cursor_to (y, x); | |
3651 } | |
3652 | |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
3653 #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
|
3654 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
|
3655 #endif |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
3656 |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3657 if (FRAME_RIF (f)) |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3658 FRAME_RIF (f)->update_window_end_hook (w, 1, 0); |
25012 | 3659 update_end (f); |
3660 updated_row = NULL; | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3661 if (FRAME_TERMCAP_P (f)) |
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3662 fflush (TTY_OUTPUT (FRAME_TTY (f))); |
25012 | 3663 |
3664 TRACE ((stderr, "direct output for insert\n")); | |
44260
64c67a3eebb2
(direct_output_for_insert): Call
Gerd Moellmann <gerd@gnu.org>
parents:
43729
diff
changeset
|
3665 mark_window_display_accurate (it.window, 1); |
25012 | 3666 redisplay_performed_directly_p = 1; |
314 | 3667 return 1; |
3668 } | |
3669 | |
25012 | 3670 |
3671 /* Perform a direct display update for moving PT by N positions | |
3672 left or right. N < 0 means a movement backwards. This function | |
3673 is currently only called for N == 1 or N == -1. */ | |
3674 | |
314 | 3675 int |
3676 direct_output_forward_char (n) | |
3677 int n; | |
3678 { | |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
3679 struct frame *f = SELECTED_FRAME (); |
25012 | 3680 struct window *w = XWINDOW (selected_window); |
3681 struct glyph_row *row; | |
3682 | |
26851
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3683 /* 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
|
3684 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
|
3685 current_buffer, PT)) |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3686 return 0; |
2513566d55fd
(direct_output_forward_char): Check point moving into
Kenichi Handa <handa@m17n.org>
parents:
26729
diff
changeset
|
3687 |
25012 | 3688 /* Give up if face attributes have been changed. */ |
3689 if (face_change_count) | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
3690 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3691 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3692 /* Give up if current matrix is not up to date or we are |
25012 | 3693 displaying a message. */ |
3694 if (!display_completed || cursor_in_echo_area) | |
3695 return 0; | |
3696 | |
3697 /* Give up if the buffer's direction is reversed. */ | |
3698 if (!NILP (XBUFFER (w->buffer)->direction_reversed)) | |
314 | 3699 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
|
3700 |
2794
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3701 /* 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
|
3702 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
|
3703 return 0; |
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
3704 |
25304
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3705 /* Can't use direct output if highlighting trailing whitespace. */ |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3706 if (!NILP (Vshow_trailing_whitespace)) |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3707 return 0; |
4b75c26bd356
(direct_output_for_insert): Use
Gerd Moellmann <gerd@gnu.org>
parents:
25241
diff
changeset
|
3708 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3709 /* 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
|
3710 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
|
3711 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
|
3712 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3713 |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3714 /* 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
|
3715 minibuffer contents. */ |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3716 if (XWINDOW (minibuf_window) == w |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3717 && EQ (minibuf_window, echo_area_window)) |
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
3718 return 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3719 |
25735
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3720 /* Give up if we 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
|
3721 if (w->cursor.vpos < 0) |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3722 return 0; |
fcb92c26acf2
(direct_output_forward_char): Don't use this method
Gerd Moellmann <gerd@gnu.org>
parents:
25725
diff
changeset
|
3723 |
25012 | 3724 row = MATRIX_ROW (w->current_matrix, w->cursor.vpos); |
3725 | |
31271
4f0c5eecc5a6
(build_frame_matrix_from_leaf_window): If a row of a
Gerd Moellmann <gerd@gnu.org>
parents:
31093
diff
changeset
|
3726 /* 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
|
3727 if (PT <= MATRIX_ROW_START_CHARPOS (row) |
818a84568f83
(direct_output_forward_char): Fix character/byte
Gerd Moellmann <gerd@gnu.org>
parents:
41025
diff
changeset
|
3728 || 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
|
3729 return 0; |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
3730 |
25012 | 3731 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
|
3732 |
25012 | 3733 w->last_cursor = w->cursor; |
16039
855c8d8ba0f0
Change all references from point to PT.
Karl Heuer <kwzh@gnu.org>
parents:
15896
diff
changeset
|
3734 XSETFASTINT (w->last_point, PT); |
25012 | 3735 |
3736 xassert (w->cursor.hpos >= 0 | |
3737 && w->cursor.hpos < w->desired_matrix->matrix_w); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3738 |
25012 | 3739 if (FRAME_WINDOW_P (f)) |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3740 FRAME_RIF (f)->cursor_to (w->cursor.vpos, w->cursor.hpos, |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3741 w->cursor.y, w->cursor.x); |
25012 | 3742 else |
3743 { | |
3744 int x, y; | |
3745 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
|
3746 + (INTEGERP (w->left_margin_cols) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
3747 ? XFASTINT (w->left_margin_cols) |
25012 | 3748 : 0)); |
3749 y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
3750 cursor_to (y, x); | |
3751 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3752 |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3753 if (FRAME_TERMCAP_P (f)) |
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
3754 fflush (TTY_OUTPUT (FRAME_TTY (f))); |
25012 | 3755 redisplay_performed_directly_p = 1; |
314 | 3756 return 1; |
3757 } | |
25012 | 3758 |
3759 | |
314 | 3760 |
25012 | 3761 /*********************************************************************** |
3762 Frame Update | |
3763 ***********************************************************************/ | |
3764 | |
3765 /* Update frame F based on the data in desired matrices. | |
3766 | |
3767 If FORCE_P is non-zero, don't let redisplay be stopped by detecting | |
3768 pending input. If INHIBIT_HAIRY_ID_P is non-zero, don't try | |
3769 scrolling. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3770 |
25012 | 3771 Value is non-zero if redisplay was stopped due to pending input. */ |
314 | 3772 |
3773 int | |
25012 | 3774 update_frame (f, force_p, inhibit_hairy_id_p) |
3775 struct frame *f; | |
3776 int force_p; | |
3777 int inhibit_hairy_id_p; | |
3778 { | |
3779 /* 1 means display has been paused because of pending input. */ | |
3780 int paused_p; | |
3781 struct window *root_window = XWINDOW (f->root_window); | |
3782 | |
3783 if (FRAME_WINDOW_P (f)) | |
3784 { | |
3785 /* We are working on window matrix basis. All windows whose | |
3786 flag must_be_updated_p is set have to be updated. */ | |
3787 | |
3788 /* Record that we are not working on frame matrices. */ | |
3789 set_frame_matrix_frame (NULL); | |
3790 | |
3791 /* Update all windows in the window tree of F, maybe stopping | |
3792 when pending input is detected. */ | |
3793 update_begin (f); | |
3794 | |
3795 /* Update the menu bar on X frames that don't have toolkit | |
3796 support. */ | |
3797 if (WINDOWP (f->menu_bar_window)) | |
3798 update_window (XWINDOW (f->menu_bar_window), 1); | |
3799 | |
3800 /* 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
|
3801 if (WINDOWP (f->tool_bar_window)) |
25012 | 3802 { |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3803 struct window *w = XWINDOW (f->tool_bar_window); |
25012 | 3804 |
3805 /* Update tool-bar window. */ | |
3806 if (w->must_be_updated_p) | |
3807 { | |
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
|
3808 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
|
3809 |
25012 | 3810 update_window (w, 1); |
3811 w->must_be_updated_p = 0; | |
3812 | |
3813 /* Swap tool-bar strings. We swap because we want to | |
3814 reuse strings. */ | |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
3815 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
|
3816 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
|
3817 f->desired_tool_bar_string = tem; |
25012 | 3818 } |
3819 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3820 |
25012 | 3821 |
3822 /* Update windows. */ | |
3823 paused_p = update_window_tree (root_window, force_p); | |
3824 update_end (f); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3825 |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3826 /* This flush is a performance bottleneck under X, |
83037 | 3827 and it doesn't seem to be necessary anyway (in general). |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3828 It is necessary when resizing the window with the mouse, or |
83037 | 3829 at least the fringes are not redrawn in a timely manner. ++kfs */ |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
3830 if (f->force_flush_display_p) |
83037 | 3831 { |
3832 FRAME_RIF (f)->flush_display (f); | |
3833 f->force_flush_display_p = 0; | |
3834 } | |
25012 | 3835 } |
3836 else | |
3837 { | |
3838 /* We are working on frame matrix basis. Set the frame on whose | |
3839 frame matrix we operate. */ | |
3840 set_frame_matrix_frame (f); | |
3841 | |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3842 /* Build F's desired matrix from window matrices. */ |
25012 | 3843 build_frame_matrix (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3844 |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3845 /* Update the display */ |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3846 update_begin (f); |
25012 | 3847 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
|
3848 update_end (f); |
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3849 |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3850 if (FRAME_TERMCAP_P (f)) |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3851 { |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3852 if (TTY_TERMSCRIPT (FRAME_TTY (f))) |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3853 fflush (TTY_TERMSCRIPT (FRAME_TTY (f))); |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3854 fflush (TTY_OUTPUT (FRAME_TTY (f))); |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
3855 } |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3856 |
25012 | 3857 /* 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
|
3858 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3859 check_window_matrix_pointers (root_window); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3860 add_frame_display_history (f, paused_p); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
3861 #endif |
25012 | 3862 } |
3863 | |
3864 /* Reset flags indicating that a window should be updated. */ | |
3865 set_window_update_flags (root_window, 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3866 |
31295
d4f918f0b184
(update_frame): Only set display_completed here; use
Gerd Moellmann <gerd@gnu.org>
parents:
31271
diff
changeset
|
3867 display_completed = !paused_p; |
25012 | 3868 return paused_p; |
3869 } | |
3870 | |
3871 | |
3872 | |
3873 /************************************************************************ | |
3874 Window-based updates | |
3875 ************************************************************************/ | |
3876 | |
3877 /* Perform updates in window tree rooted at W. FORCE_P non-zero means | |
3878 don't stop updating when input is pending. */ | |
3879 | |
3880 static int | |
3881 update_window_tree (w, force_p) | |
3882 struct window *w; | |
3883 int force_p; | |
3884 { | |
3885 int paused_p = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3886 |
25012 | 3887 while (w && !paused_p) |
3888 { | |
3889 if (!NILP (w->hchild)) | |
3890 paused_p |= update_window_tree (XWINDOW (w->hchild), force_p); | |
3891 else if (!NILP (w->vchild)) | |
3892 paused_p |= update_window_tree (XWINDOW (w->vchild), force_p); | |
3893 else if (w->must_be_updated_p) | |
3894 paused_p |= update_window (w, force_p); | |
3895 | |
3896 w = NILP (w->next) ? 0 : XWINDOW (w->next); | |
3897 } | |
3898 | |
3899 return paused_p; | |
3900 } | |
3901 | |
3902 | |
3903 /* Update window W if its flag must_be_updated_p is non-zero. If | |
3904 FORCE_P is non-zero, don't stop updating if input is pending. */ | |
3905 | |
3906 void | |
3907 update_single_window (w, force_p) | |
3908 struct window *w; | |
3909 int force_p; | |
3910 { | |
3911 if (w->must_be_updated_p) | |
3912 { | |
3913 struct frame *f = XFRAME (WINDOW_FRAME (w)); | |
3914 | |
3915 /* Record that this is not a frame-based redisplay. */ | |
3916 set_frame_matrix_frame (NULL); | |
3917 | |
3918 /* Update W. */ | |
3919 update_begin (f); | |
3920 update_window (w, force_p); | |
3921 update_end (f); | |
3922 | |
3923 /* Reset flag in W. */ | |
3924 w->must_be_updated_p = 0; | |
3925 } | |
3926 } | |
3927 | |
3928 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3929 /* 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
|
3930 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
|
3931 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3932 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3933 redraw_overlapped_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3934 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3935 int yb; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3936 { |
30165
d7ec5b3caccc
(redraw_overlapped_rows): Add missing local.
Gerd Moellmann <gerd@gnu.org>
parents:
30161
diff
changeset
|
3937 int i; |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3938 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3939 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3940 /* If rows overlapping others have been changed, the rows being |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3941 overlapped have to be redrawn. This won't draw lines that have |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3942 already been drawn in update_window_line because overlapped_p in |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3943 desired rows is 0, so after row assignment overlapped_p in |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3944 current rows is 0. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3945 for (i = 0; i < w->current_matrix->nrows; ++i) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3946 { |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3947 struct glyph_row *row = w->current_matrix->rows + i; |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3948 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3949 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3950 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3951 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3952 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3953 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3954 if (row->overlapped_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3955 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3956 enum glyph_row_area area; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3957 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3958 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3959 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3960 updated_row = row; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3961 updated_area = area; |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3962 FRAME_RIF (f)->cursor_to (i, 0, row->y, |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3963 area == TEXT_AREA ? row->x : 0); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3964 if (row->used[area]) |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3965 FRAME_RIF (f)->write_glyphs (row->glyphs[area], |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3966 row->used[area]); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3967 FRAME_RIF (f)->clear_end_of_line (-1); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3968 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3969 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3970 row->overlapped_p = 0; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3971 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3972 |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
3973 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
|
3974 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3975 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3976 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3977 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3978 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3979 /* 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
|
3980 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
|
3981 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3982 static void |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3983 redraw_overlapping_rows (w, yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3984 struct window *w; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3985 int yb; |
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 int i, bottom_y; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3988 struct glyph_row *row; |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3989 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
3990 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3991 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
|
3992 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3993 row = w->current_matrix->rows + i; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3994 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3995 if (!row->enabled_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3996 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3997 else if (row->mode_line_p) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
3998 continue; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
3999 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4000 bottom_y = MATRIX_ROW_BOTTOM_Y (row); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4001 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4002 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
|
4003 { |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4004 if (row->used[LEFT_MARGIN_AREA]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4005 rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4006 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4007 if (row->used[TEXT_AREA]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4008 rif->fix_overlapping_area (w, row, TEXT_AREA); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4009 |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4010 if (row->used[RIGHT_MARGIN_AREA]) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4011 rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA); |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4012 |
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
|
4013 /* Record in neighbour rows that ROW overwrites part of their |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4014 display. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4015 if (row->phys_ascent > row->ascent && i > 0) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4016 MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4017 if ((row->phys_height - row->phys_ascent |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4018 > row->height - row->ascent) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4019 && bottom_y < yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4020 MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4021 } |
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 if (bottom_y >= yb) |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4024 break; |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4025 } |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4026 } |
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 |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4029 #ifdef GLYPH_DEBUG |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4030 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4031 /* 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
|
4032 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
|
4033 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4034 void |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4035 check_current_matrix_flags (w) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4036 struct window *w; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4037 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4038 int last_seen_p = 0; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4039 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
|
4040 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4041 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
|
4042 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4043 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
|
4044 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
|
4045 last_seen_p = 1; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4046 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
|
4047 abort (); |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4048 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4049 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4050 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4051 #endif /* GLYPH_DEBUG */ |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4052 |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4053 |
25012 | 4054 /* Update display of window W. FORCE_P non-zero means that we should |
4055 not stop when detecting pending input. */ | |
4056 | |
4057 static int | |
4058 update_window (w, force_p) | |
4059 struct window *w; | |
4060 int force_p; | |
4061 { | |
4062 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4063 int paused_p; | |
4064 int preempt_count = baud_rate / 2400 + 1; | |
4065 extern int input_pending; | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4066 extern Lisp_Object do_mouse_tracking; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4067 #if GLYPH_DEBUG |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4068 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4069 #endif |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4070 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25012 | 4071 |
4072 /* Check that W's frame doesn't have glyph matrices. */ | |
4073 xassert (FRAME_WINDOW_P (f)); | |
4074 xassert (updating_frame != NULL); | |
4075 | |
4076 /* Check pending input the first time so that we can quickly return. */ | |
4077 if (redisplay_dont_pause) | |
4078 force_p = 1; | |
4079 else | |
4080 detect_input_pending (); | |
4081 | |
4082 /* If forced to complete the update, or if no input is pending, do | |
4083 the update. */ | |
34517
7c8d2cec3d08
(update_window): If do_mouse_tracking is non-nil,
Gerd Moellmann <gerd@gnu.org>
parents:
34279
diff
changeset
|
4084 if (force_p || !input_pending || !NILP (do_mouse_tracking)) |
25012 | 4085 { |
4086 struct glyph_row *row, *end; | |
4087 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
|
4088 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
|
4089 int yb, changed_p = 0, mouse_face_overwritten_p = 0, n_updated; |
25012 | 4090 |
4091 rif->update_window_begin_hook (w); | |
4092 yb = window_text_bottom_y (w); | |
4093 | |
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
|
4094 /* 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
|
4095 Adjust y-positions of other rows by the header line height. */ |
25012 | 4096 row = desired_matrix->rows; |
4097 end = row + desired_matrix->nrows - 1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4098 |
25012 | 4099 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
|
4100 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4101 header_line_row = row; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4102 ++row; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4103 } |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4104 else |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4105 header_line_row = NULL; |
25012 | 4106 |
4107 /* Update the mode line, if necessary. */ | |
4108 mode_line_row = MATRIX_MODE_LINE_ROW (desired_matrix); | |
4109 if (mode_line_row->mode_line_p && mode_line_row->enabled_p) | |
4110 { | |
4111 mode_line_row->y = yb; | |
4112 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
|
4113 desired_matrix), |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4114 &mouse_face_overwritten_p); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4115 changed_p = 1; |
25012 | 4116 } |
4117 | |
4118 /* Find first enabled row. Optimizations in redisplay_internal | |
4119 may lead to an update with only one row enabled. There may | |
4120 be also completely empty matrices. */ | |
4121 while (row < end && !row->enabled_p) | |
4122 ++row; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4123 |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4124 /* Try reusing part of the display by copying. */ |
25012 | 4125 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
|
4126 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4127 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
|
4128 if (rc < 0) |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4129 { |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4130 /* 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
|
4131 paused_p = 0; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4132 goto set_cursor; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4133 } |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4134 else if (rc > 0) |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4135 /* We've scrolled the display. */ |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4136 force_p = 1; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4137 changed_p = 1; |
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4138 } |
25012 | 4139 |
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
|
4140 /* Update the header line after scrolling because a new header |
25012 | 4141 line would otherwise overwrite lines at the top of the window |
4142 that can be scrolled. */ | |
25546 | 4143 if (header_line_row && header_line_row->enabled_p) |
25012 | 4144 { |
25546 | 4145 header_line_row->y = 0; |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4146 update_window_line (w, 0, &mouse_face_overwritten_p); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4147 changed_p = 1; |
25012 | 4148 } |
4149 | |
4150 /* 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
|
4151 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
|
4152 if (row->enabled_p) |
25012 | 4153 { |
4154 int vpos = MATRIX_ROW_VPOS (row, desired_matrix); | |
4155 int i; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4156 |
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
|
4157 /* We'll have to play a little bit with when to |
25012 | 4158 detect_input_pending. If it's done too often, |
4159 scrolling large windows with repeated scroll-up | |
4160 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
|
4161 if (!force_p && ++n_updated % preempt_count == 0) |
25012 | 4162 detect_input_pending (); |
4163 | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4164 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
|
4165 &mouse_face_overwritten_p); |
25012 | 4166 |
4167 /* Mark all rows below the last visible one in the current | |
4168 matrix as invalid. This is necessary because of | |
4169 variable line heights. Consider the case of three | |
4170 successive redisplays, where the first displays 5 | |
4171 lines, the second 3 lines, and the third 5 lines again. | |
4172 If the second redisplay wouldn't mark rows in the | |
4173 current matrix invalid, the third redisplay might be | |
4174 tempted to optimize redisplay based on lines displayed | |
4175 in the first redisplay. */ | |
4176 if (MATRIX_ROW_BOTTOM_Y (row) >= yb) | |
4177 for (i = vpos + 1; i < w->current_matrix->nrows - 1; ++i) | |
4178 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0; | |
4179 } | |
4180 | |
4181 /* Was display preempted? */ | |
4182 paused_p = row < end; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4183 |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4184 set_cursor: |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4185 |
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
|
4186 /* Fix the appearance of overlapping/overlapped rows. */ |
25012 | 4187 if (!paused_p && !w->pseudo_window_p) |
4188 { | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4189 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
|
4190 { |
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4191 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
|
4192 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
|
4193 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4194 |
25012 | 4195 /* Make cursor visible at cursor position of W. */ |
4196 set_window_cursor_after_update (w); | |
4197 | |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4198 #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
|
4199 for debugging only. See the comment of check_matrix_invariants. */ |
25012 | 4200 IF_DEBUG (check_matrix_invariants (w)); |
4201 #endif | |
4202 } | |
4203 | |
4204 #if GLYPH_DEBUG | |
4205 /* Remember the redisplay method used to display the matrix. */ | |
4206 strcpy (w->current_matrix->method, w->desired_matrix->method); | |
4207 #endif | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4208 |
53612
2ddd2a0d047a
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-41
Miles Bader <miles@gnu.org>
parents:
53605
diff
changeset
|
4209 #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
|
4210 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
|
4211 #endif |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4212 |
38489
19cb32759a2a
(update_window): Don't set the cursor at the end
Gerd Moellmann <gerd@gnu.org>
parents:
38354
diff
changeset
|
4213 /* 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
|
4214 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
|
4215 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
|
4216 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
|
4217 rif->update_window_end_hook (w, !paused_p, mouse_face_overwritten_p); |
25012 | 4218 } |
4219 else | |
4220 paused_p = 1; | |
4221 | |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
4222 #if GLYPH_DEBUG |
34944
4fc804373f2a
(update_window): Don't check_current_matrix_flags.
Gerd Moellmann <gerd@gnu.org>
parents:
34929
diff
changeset
|
4223 /* check_current_matrix_flags (w); */ |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
4224 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
|
4225 #endif |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4226 |
25012 | 4227 clear_glyph_matrix (desired_matrix); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4228 |
25012 | 4229 return paused_p; |
4230 } | |
4231 | |
4232 | |
4233 /* Update the display of area AREA in window W, row number VPOS. | |
4234 AREA can be either LEFT_MARGIN_AREA or RIGHT_MARGIN_AREA. */ | |
4235 | |
4236 static void | |
4237 update_marginal_area (w, area, vpos) | |
4238 struct window *w; | |
4239 int area, vpos; | |
4240 { | |
4241 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4242 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25012 | 4243 |
4244 /* Let functions in xterm.c know what area subsequent X positions | |
4245 will be relative to. */ | |
4246 updated_area = area; | |
4247 | |
4248 /* Set cursor to start of glyphs, write them, and clear to the end | |
4249 of the area. I don't think that something more sophisticated is | |
4250 necessary here, since marginal areas will not be the default. */ | |
4251 rif->cursor_to (vpos, 0, desired_row->y, 0); | |
4252 if (desired_row->used[area]) | |
4253 rif->write_glyphs (desired_row->glyphs[area], desired_row->used[area]); | |
4254 rif->clear_end_of_line (-1); | |
4255 } | |
4256 | |
4257 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4258 /* 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
|
4259 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
|
4260 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4261 static int |
25012 | 4262 update_text_area (w, vpos) |
4263 struct window *w; | |
4264 int vpos; | |
314 | 4265 { |
25012 | 4266 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); |
4267 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4268 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4269 int changed_p = 0; |
25012 | 4270 |
4271 /* Let functions in xterm.c know what area subsequent X positions | |
4272 will be relative to. */ | |
4273 updated_area = TEXT_AREA; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4274 |
25012 | 4275 /* If rows are at different X or Y, or rows have different height, |
4276 or the current row is marked invalid, write the entire line. */ | |
4277 if (!current_row->enabled_p | |
4278 || desired_row->y != current_row->y | |
4279 || desired_row->ascent != current_row->ascent | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4280 || 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
|
4281 || desired_row->phys_height != current_row->phys_height |
25012 | 4282 || 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
|
4283 || current_row->overlapped_p |
30307
faf4e303bab7
(update_text_area): Write the whole row if it
Gerd Moellmann <gerd@gnu.org>
parents:
30165
diff
changeset
|
4284 || current_row->mouse_face_p |
25012 | 4285 || current_row->x != desired_row->x) |
4286 { | |
4287 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
|
4288 |
25012 | 4289 if (desired_row->used[TEXT_AREA]) |
4290 rif->write_glyphs (desired_row->glyphs[TEXT_AREA], | |
4291 desired_row->used[TEXT_AREA]); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4292 |
25012 | 4293 /* Clear to end of window. */ |
4294 rif->clear_end_of_line (-1); | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4295 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
|
4296 |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4297 /* 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
|
4298 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
|
4299 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
|
4300 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
|
4301 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
|
4302 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
|
4303 redisplay. */ |
cf2454d3a103
(update_text_area): Set phys_cursor_on_p to 0 in the
Gerd Moellmann <gerd@gnu.org>
parents:
44580
diff
changeset
|
4304 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
|
4305 w->phys_cursor_on_p = 0; |
25012 | 4306 } |
4307 else | |
4308 { | |
4309 int stop, i, x; | |
4310 struct glyph *current_glyph = current_row->glyphs[TEXT_AREA]; | |
4311 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
|
4312 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
|
4313 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
|
4314 |
25012 | 4315 /* If the desired row extends its face to the text area end, |
4316 make sure we write at least one glyph, so that the face | |
4317 extension actually takes place. */ | |
35269 | 4318 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) |
35268
d93bf580d166
(update_text_area): Put code which decrements the
Gerd Moellmann <gerd@gnu.org>
parents:
35006
diff
changeset
|
4319 --desired_stop_pos; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4320 |
25012 | 4321 stop = min (current_row->used[TEXT_AREA], desired_stop_pos); |
4322 i = 0; | |
4323 x = desired_row->x; | |
36097
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4324 |
1dfaaf6d6166
(update_text_area): Undo change of 2001-01-12.
Gerd Moellmann <gerd@gnu.org>
parents:
35924
diff
changeset
|
4325 /* 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
|
4326 in common. */ |
25012 | 4327 while (i < stop) |
4328 { | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4329 int can_skip_p = 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4330 |
25012 | 4331 /* 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
|
4332 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
|
4333 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
|
4334 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
|
4335 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
|
4336 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
|
4337 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
|
4338 `f' on the screen. */ |
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4339 if (overlapping_glyphs_p && i > 0) |
25012 | 4340 { |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4341 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
|
4342 int left, right; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4343 |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4344 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
|
4345 &left, &right); |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4346 can_skip_p = right == 0; |
25012 | 4347 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4348 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4349 if (can_skip_p) |
25012 | 4350 { |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4351 while (i < stop |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4352 && GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4353 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4354 x += desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4355 ++desired_glyph, ++current_glyph, ++i; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4356 } |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4357 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4358 /* 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
|
4359 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
|
4360 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
|
4361 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
|
4362 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
|
4363 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
|
4364 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
|
4365 taken care of by draw_glyphs. */ |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4366 if (overlapping_glyphs_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4367 && i > 0 |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4368 && i < current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4369 && (current_row->used[TEXT_AREA] |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4370 != desired_row->used[TEXT_AREA])) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4371 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4372 int left, right; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4373 |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4374 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
|
4375 &left, &right); |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4376 while (left > 0 && i > 0) |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4377 { |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4378 --i, --desired_glyph, --current_glyph; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4379 x -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4380 left -= desired_glyph->pixel_width; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4381 } |
25012 | 4382 } |
4383 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4384 |
25012 | 4385 /* Try to avoid writing the entire rest of the desired row |
4386 by looking for a resync point. This mainly prevents | |
4387 mode line flickering in the case the mode line is in | |
4388 fixed-pitch font, which it usually will be. */ | |
4389 if (i < desired_row->used[TEXT_AREA]) | |
4390 { | |
4391 int start_x = x, start_hpos = i; | |
4392 struct glyph *start = desired_glyph; | |
4393 int current_x = x; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4394 int skip_first_p = !can_skip_p; |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4395 |
25012 | 4396 /* Find the next glyph that's equal again. */ |
4397 while (i < stop | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4398 && (skip_first_p |
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4399 || !GLYPH_EQUAL_P (desired_glyph, current_glyph)) |
25012 | 4400 && x == current_x) |
4401 { | |
4402 x += desired_glyph->pixel_width; | |
4403 current_x += current_glyph->pixel_width; | |
4404 ++desired_glyph, ++current_glyph, ++i; | |
33603
6697403d3c12
(update_text_area): Fix last change.
Gerd Moellmann <gerd@gnu.org>
parents:
33596
diff
changeset
|
4405 skip_first_p = 0; |
25012 | 4406 } |
4407 | |
4408 if (i == start_hpos || x != current_x) | |
4409 { | |
4410 i = start_hpos; | |
4411 x = start_x; | |
4412 desired_glyph = start; | |
4413 break; | |
4414 } | |
33596
680ddd4ab1f9
(update_text_area): Don't skip over equal glyphs
Gerd Moellmann <gerd@gnu.org>
parents:
33527
diff
changeset
|
4415 |
25012 | 4416 rif->cursor_to (vpos, start_hpos, desired_row->y, start_x); |
4417 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
|
4418 changed_p = 1; |
25012 | 4419 } |
4420 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4421 |
25012 | 4422 /* Write the rest. */ |
4423 if (i < desired_row->used[TEXT_AREA]) | |
4424 { | |
4425 rif->cursor_to (vpos, i, desired_row->y, x); | |
4426 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
|
4427 changed_p = 1; |
25012 | 4428 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4429 |
25012 | 4430 /* Maybe clear to end of line. */ |
4431 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)) | |
4432 { | |
4433 /* If new row extends to the end of the text area, nothing | |
4434 has to be cleared, if and only if we did a write_glyphs | |
4435 above. This is made sure by setting desired_stop_pos | |
4436 appropriately above. */ | |
4437 xassert (i < desired_row->used[TEXT_AREA]); | |
4438 } | |
4439 else if (MATRIX_ROW_EXTENDS_FACE_P (current_row)) | |
4440 { | |
4441 /* If old row extends to the end of the text area, clear. */ | |
4442 if (i >= desired_row->used[TEXT_AREA]) | |
4443 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
|
4444 desired_row->pixel_width); |
25012 | 4445 rif->clear_end_of_line (-1); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4446 changed_p = 1; |
25012 | 4447 } |
4448 else if (desired_row->pixel_width < current_row->pixel_width) | |
4449 { | |
4450 /* Otherwise clear to the end of the old row. Everything | |
4451 after that position should be clear already. */ | |
4452 int x; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4453 |
25012 | 4454 if (i >= desired_row->used[TEXT_AREA]) |
4455 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
|
4456 desired_row->pixel_width); |
25012 | 4457 |
4458 /* If cursor is displayed at the end of the line, make sure | |
4459 it's cleared. Nowadays we don't have a phys_cursor_glyph | |
4460 with which to erase the cursor (because this method | |
4461 doesn't work with lbearing/rbearing), so we must do it | |
4462 this way. */ | |
4463 if (vpos == w->phys_cursor.vpos | |
4464 && w->phys_cursor.hpos >= desired_row->used[TEXT_AREA]) | |
4465 { | |
4466 w->phys_cursor_on_p = 0; | |
4467 x = -1; | |
4468 } | |
4469 else | |
53055
4cb0d5b004e9
(update_text_area): Fix redisplay error when hscroll
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
4470 x = current_row->pixel_width; |
25012 | 4471 rif->clear_end_of_line (x); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4472 changed_p = 1; |
25012 | 4473 } |
4474 } | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4475 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4476 return changed_p; |
25012 | 4477 } |
4478 | |
4479 | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4480 /* 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
|
4481 changed. */ |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4482 |
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4483 static int |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4484 update_window_line (w, vpos, mouse_face_overwritten_p) |
25012 | 4485 struct window *w; |
30161
8be2bf27e9ad
(make_current): Preserve the mouse_face_p flag of the
Gerd Moellmann <gerd@gnu.org>
parents:
30152
diff
changeset
|
4486 int vpos, *mouse_face_overwritten_p; |
25012 | 4487 { |
4488 struct glyph_row *current_row = MATRIX_ROW (w->current_matrix, vpos); | |
4489 struct glyph_row *desired_row = MATRIX_ROW (w->desired_matrix, vpos); | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4490 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4491 int changed_p = 0; |
25012 | 4492 |
4493 /* Set the row being updated. This is important to let xterm.c | |
4494 know what line height values are in effect. */ | |
4495 updated_row = desired_row; | |
4496 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4497 /* 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
|
4498 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
|
4499 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
|
4500 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
|
4501 if (desired_row->mode_line_p |
59b455472b56
(update_window_line): Make sure to always draw
Gerd Moellmann <gerd@gnu.org>
parents:
31690
diff
changeset
|
4502 || desired_row->visible_height > 0) |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4503 { |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4504 xassert (desired_row->enabled_p); |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4505 |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4506 /* 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
|
4507 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
|
4508 && !NILP (w->left_margin_cols)) |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4509 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4510 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4511 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
|
4512 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4513 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4514 /* Update the display of the text area. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4515 if (update_text_area (w, vpos)) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4516 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4517 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4518 if (current_row->mouse_face_p) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4519 *mouse_face_overwritten_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4520 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4521 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4522 /* 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
|
4523 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
|
4524 && !NILP (w->right_margin_cols)) |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4525 { |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4526 changed_p = 1; |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4527 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
|
4528 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4529 |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4530 /* Draw truncation marks etc. */ |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4531 if (!current_row->enabled_p |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4532 || desired_row->y != current_row->y |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4533 || 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
|
4534 || desired_row->cursor_in_fringe_p != current_row->cursor_in_fringe_p |
53881
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
4535 || desired_row->overlay_arrow_p != current_row->overlay_arrow_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4536 || current_row->redraw_fringe_bitmaps_p |
31690
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4537 || 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
|
4538 || 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
|
4539 || (MATRIX_ROW_CONTINUATION_LINE_P (desired_row) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4540 != MATRIX_ROW_CONTINUATION_LINE_P (current_row))) |
6abff42174ea
(update_window): Move test for invisible lines
Gerd Moellmann <gerd@gnu.org>
parents:
31653
diff
changeset
|
4541 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
|
4542 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4543 |
25012 | 4544 /* Update current_row from desired_row. */ |
4545 make_current (w->desired_matrix, w->current_matrix, vpos); | |
4546 updated_row = NULL; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
4547 return changed_p; |
25012 | 4548 } |
4549 | |
4550 | |
4551 /* Set the cursor after an update of window W. This function may only | |
4552 be called from update_window. */ | |
4553 | |
4554 static void | |
4555 set_window_cursor_after_update (w) | |
4556 struct window *w; | |
4557 { | |
4558 struct frame *f = XFRAME (w->frame); | |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4559 struct redisplay_interface *rif = FRAME_RIF (f); |
25012 | 4560 int cx, cy, vpos, hpos; |
4561 | |
4562 /* Not intended for frame matrix updates. */ | |
4563 xassert (FRAME_WINDOW_P (f)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4564 |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4565 if (cursor_in_echo_area |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4566 && !NILP (echo_area_buffer[0]) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4567 /* 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
|
4568 show the cursor for the message instead. */ |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4569 && XWINDOW (minibuf_window) == w |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4570 && EQ (minibuf_window, echo_area_window) |
25012 | 4571 /* These cases apply only to the frame that contains |
4572 the active mini-buffer window. */ | |
4573 && FRAME_HAS_MINIBUF_P (f) | |
4574 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) | |
4575 { | |
4576 cx = cy = vpos = hpos = 0; | |
4577 | |
4578 if (cursor_in_echo_area >= 0) | |
4579 { | |
4580 /* If the mini-buffer is several lines high, find the last | |
4581 line that has any text on it. Note: either all lines | |
4582 are enabled or none. Otherwise we wouldn't be able to | |
4583 determine Y. */ | |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4584 struct glyph_row *row, *last_row; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4585 struct glyph *glyph; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4586 int yb = window_text_bottom_y (w); |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4587 |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4588 last_row = NULL; |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4589 row = w->current_matrix->rows; |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4590 while (row->enabled_p |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4591 && (last_row == NULL |
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4592 || MATRIX_ROW_BOTTOM_Y (row) <= yb)) |
25012 | 4593 { |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4594 if (row->used[TEXT_AREA] |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4595 && row->glyphs[TEXT_AREA][0].charpos >= 0) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4596 last_row = row; |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4597 ++row; |
25012 | 4598 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4599 |
25012 | 4600 if (last_row) |
4601 { | |
39254
73dd40615520
(set_window_cursor_after_update): Fix code
Gerd Moellmann <gerd@gnu.org>
parents:
39226
diff
changeset
|
4602 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
|
4603 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
|
4604 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
4605 while (last > start && last->charpos < 0) |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4606 --last; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4607 |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4608 for (glyph = start; glyph < last; ++glyph) |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4609 { |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4610 cx += glyph->pixel_width; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4611 ++hpos; |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4612 } |
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4613 |
25012 | 4614 cy = last_row->y; |
25190
a14edd4a5f4a
(set_window_cursor_after_update): Correct cursor
Gerd Moellmann <gerd@gnu.org>
parents:
25186
diff
changeset
|
4615 vpos = MATRIX_ROW_VPOS (last_row, w->current_matrix); |
25012 | 4616 } |
4617 } | |
4618 } | |
4619 else | |
4620 { | |
4621 cx = w->cursor.x; | |
4622 cy = w->cursor.y; | |
4623 hpos = w->cursor.hpos; | |
4624 vpos = w->cursor.vpos; | |
4625 } | |
4626 | |
4627 /* Window cursor can be out of sync for horizontally split windows. */ | |
4628 hpos = max (0, hpos); | |
4629 hpos = min (w->current_matrix->matrix_w - 1, hpos); | |
4630 vpos = max (0, vpos); | |
4631 vpos = min (w->current_matrix->nrows - 1, vpos); | |
4632 rif->cursor_to (vpos, hpos, cy, cx); | |
4633 } | |
4634 | |
4635 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4636 /* 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
|
4637 tree rooted at W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4638 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4639 void |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4640 set_window_update_flags (w, on_p) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4641 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4642 int on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4643 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4644 while (w) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4645 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4646 if (!NILP (w->hchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4647 set_window_update_flags (XWINDOW (w->hchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4648 else if (!NILP (w->vchild)) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4649 set_window_update_flags (XWINDOW (w->vchild), on_p); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4650 else |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4651 w->must_be_updated_p = on_p; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4652 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4653 w = NILP (w->next) ? 0 : XWINDOW (w->next); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4654 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4655 } |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4656 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4657 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4658 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4659 /*********************************************************************** |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4660 Window-Based Scrolling |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4661 ***********************************************************************/ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4662 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4663 /* Structure describing rows in scrolling_window. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4664 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4665 struct row_entry |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4666 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4667 /* 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
|
4668 int old_uses, new_uses; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4669 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4670 /* Vpos of row in new matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4671 int new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4672 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4673 /* 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
|
4674 int bucket; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4675 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4676 /* The row described by this entry. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4677 struct glyph_row *row; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4678 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4679 /* Hash collision chain. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4680 struct row_entry *next; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4681 }; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4682 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4683 /* 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
|
4684 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
|
4685 that we need a larger one. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4686 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4687 static struct row_entry *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4688 static int row_entry_pool_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4689 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4690 /* Index of next free entry in row_entry_pool. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4691 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4692 static int row_entry_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4693 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4694 /* 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
|
4695 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
|
4696 current matrix. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4697 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4698 static struct row_entry **row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4699 static int row_table_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4700 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4701 /* 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
|
4702 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
|
4703 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4704 static struct row_entry **old_lines, **new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4705 static int old_lines_size, new_lines_size; |
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 /* 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
|
4708 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4709 static struct run *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4710 static int runs_size; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4711 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4712 /* A vector of runs of lines found during scrolling. */ |
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 static struct run **runs; |
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 /* 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
|
4717 of window W. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4718 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4719 static INLINE struct row_entry * |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4720 add_row_entry (w, row) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4721 struct window *w; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4722 struct glyph_row *row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4723 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4724 struct row_entry *entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4725 int i = row->hash % row_table_size; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4726 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4727 entry = row_table[i]; |
30152
f6270e5282da
(direct_output_forward_char): Give up if currently
Gerd Moellmann <gerd@gnu.org>
parents:
30041
diff
changeset
|
4728 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
|
4729 entry = entry->next; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4730 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4731 if (entry == NULL) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4732 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4733 entry = row_entry_pool + row_entry_idx++; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4734 entry->row = row; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4735 entry->old_uses = entry->new_uses = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4736 entry->new_line_number = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4737 entry->bucket = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4738 entry->next = row_table[i]; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4739 row_table[i] = entry; |
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 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4742 return entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4743 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4744 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4745 |
25012 | 4746 /* 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
|
4747 HEADER_LINE_P non-zero means W has a header line. |
25012 | 4748 |
4749 The algorithm is taken from Communications of the ACM, Apr78 "A | |
4750 Technique for Isolating Differences Between Files." It should take | |
4751 O(N) time. | |
4752 | |
4753 A short outline of the steps of the algorithm | |
4754 | |
4755 1. Skip lines equal at the start and end of both matrices. | |
4756 | |
4757 2. Enter rows in the current and desired matrix into a symbol | |
4758 table, counting how often they appear in both matrices. | |
4759 | |
4760 3. Rows that appear exactly once in both matrices serve as anchors, | |
4761 i.e. we assume that such lines are likely to have been moved. | |
4762 | |
4763 4. Starting from anchor lines, extend regions to be scrolled both | |
4764 forward and backward. | |
4765 | |
4766 Value is | |
4767 | |
4768 -1 if all rows were found to be equal. | |
4769 0 to indicate that we did not scroll the display, or | |
4770 1 if we did scroll. */ | |
4771 | |
4772 static int | |
25546 | 4773 scrolling_window (w, header_line_p) |
25012 | 4774 struct window *w; |
25546 | 4775 int header_line_p; |
25012 | 4776 { |
4777 struct glyph_matrix *desired_matrix = w->desired_matrix; | |
4778 struct glyph_matrix *current_matrix = w->current_matrix; | |
4779 int yb = window_text_bottom_y (w); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4780 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
|
4781 int nruns, nbytes, n, run_idx; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4782 struct row_entry *entry; |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
82990
diff
changeset
|
4783 struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w))); |
25012 | 4784 |
4785 /* 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
|
4786 for (i = header_line_p ? 1 : 0; i < current_matrix->nrows - 1; ++i) |
25012 | 4787 { |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4788 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
|
4789 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
|
4790 |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4791 if (c->enabled_p |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4792 && d->enabled_p |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
4793 && !d->redraw_fringe_bitmaps_p |
31825
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4794 && c->y == d->y |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4795 && MATRIX_ROW_BOTTOM_Y (c) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4796 && MATRIX_ROW_BOTTOM_Y (d) <= yb |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4797 && row_equal_p (w, c, d, 1)) |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4798 { |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4799 assign_row (c, d); |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4800 d->enabled_p = 0; |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4801 } |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4802 else |
62830644b967
(scrolling_window): Compare y-positions of rows
Gerd Moellmann <gerd@gnu.org>
parents:
31726
diff
changeset
|
4803 break; |
25012 | 4804 } |
4805 | |
4806 /* Give up if some rows in the desired matrix are not enabled. */ | |
4807 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4808 return -1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4809 |
25012 | 4810 first_old = first_new = i; |
4811 | |
4812 /* Set last_new to the index + 1 of the last enabled row in the | |
4813 desired matrix. */ | |
4814 i = first_new + 1; | |
4815 while (i < desired_matrix->nrows - 1 | |
4816 && MATRIX_ROW (desired_matrix, i)->enabled_p | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4817 && MATRIX_ROW_BOTTOM_Y (MATRIX_ROW (desired_matrix, i)) <= yb) |
25012 | 4818 ++i; |
4819 | |
4820 if (!MATRIX_ROW (desired_matrix, i)->enabled_p) | |
4821 return 0; | |
4822 | |
4823 last_new = i; | |
4824 | |
4825 /* Set last_old to the index + 1 of the last enabled row in the | |
4826 current matrix. We don't look at the enabled flag here because | |
4827 we plan to reuse part of the display even if other parts are | |
4828 disabled. */ | |
4829 i = first_old + 1; | |
34929
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4830 while (i < current_matrix->nrows - 1) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4831 { |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4832 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
|
4833 if (bottom <= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4834 ++i; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4835 if (bottom >= yb) |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4836 break; |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4837 } |
b116257b3b28
(check_current_matrix_flags) [GLYPH_DEBUG]: New
Gerd Moellmann <gerd@gnu.org>
parents:
34895
diff
changeset
|
4838 |
25012 | 4839 last_old = i; |
4840 | |
4841 /* Skip over rows equal at the bottom. */ | |
4842 i = last_new; | |
4843 j = last_old; | |
4844 while (i - 1 > first_new | |
4845 && j - 1 > first_old | |
4846 && MATRIX_ROW (current_matrix, i - 1)->enabled_p | |
4847 && (MATRIX_ROW (current_matrix, i - 1)->y | |
4848 == 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
|
4849 && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p |
25012 | 4850 && row_equal_p (w, |
4851 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
|
4852 MATRIX_ROW (current_matrix, j - 1), 1)) |
25012 | 4853 --i, --j; |
4854 last_new = i; | |
4855 last_old = j; | |
4856 | |
4857 /* Nothing to do if all rows are equal. */ | |
4858 if (last_new == first_new) | |
4859 return 0; | |
4860 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4861 /* Reallocate vectors, tables etc. if necessary. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4862 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4863 if (current_matrix->nrows > old_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4864 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4865 old_lines_size = current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4866 nbytes = old_lines_size * sizeof *old_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4867 old_lines = (struct row_entry **) xrealloc (old_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4868 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4869 |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4870 if (desired_matrix->nrows > new_lines_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4871 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4872 new_lines_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4873 nbytes = new_lines_size * sizeof *new_lines; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4874 new_lines = (struct row_entry **) xrealloc (new_lines, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4875 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4876 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4877 n = desired_matrix->nrows + current_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4878 if (3 * n > row_table_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4879 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4880 row_table_size = next_almost_prime (3 * n); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4881 nbytes = row_table_size * sizeof *row_table; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4882 row_table = (struct row_entry **) xrealloc (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4883 bzero (row_table, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4884 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4885 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4886 if (n > row_entry_pool_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4887 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4888 row_entry_pool_size = n; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4889 nbytes = row_entry_pool_size * sizeof *row_entry_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4890 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
|
4891 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4892 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4893 if (desired_matrix->nrows > runs_size) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4894 { |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4895 runs_size = desired_matrix->nrows; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4896 nbytes = runs_size * sizeof *runs; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4897 runs = (struct run **) xrealloc (runs, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4898 nbytes = runs_size * sizeof *run_pool; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4899 run_pool = (struct run *) xrealloc (run_pool, nbytes); |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4900 } |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4901 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4902 nruns = run_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4903 row_entry_idx = 0; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4904 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4905 /* 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
|
4906 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
|
4907 |
25012 | 4908 for (i = first_old; i < last_old; ++i) |
4909 { | |
4910 if (MATRIX_ROW (current_matrix, i)->enabled_p) | |
4911 { | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4912 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
|
4913 old_lines[i] = entry; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4914 ++entry->old_uses; |
25012 | 4915 } |
4916 else | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4917 old_lines[i] = NULL; |
25012 | 4918 } |
4919 | |
4920 for (i = first_new; i < last_new; ++i) | |
4921 { | |
4922 xassert (MATRIX_ROW_ENABLED_P (desired_matrix, i)); | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4923 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
|
4924 ++entry->new_uses; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4925 entry->new_line_number = i; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4926 new_lines[i] = entry; |
25012 | 4927 } |
4928 | |
4929 /* Identify moves based on lines that are unique and equal | |
4930 in both matrices. */ | |
4931 for (i = first_old; i < last_old;) | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4932 if (old_lines[i] |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4933 && old_lines[i]->old_uses == 1 |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4934 && old_lines[i]->new_uses == 1) |
25012 | 4935 { |
4936 int j, k; | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4937 int new_line = old_lines[i]->new_line_number; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4938 struct run *run = run_pool + run_idx++; |
25012 | 4939 |
4940 /* Record move. */ | |
4941 run->current_vpos = i; | |
4942 run->current_y = MATRIX_ROW (current_matrix, i)->y; | |
4943 run->desired_vpos = new_line; | |
4944 run->desired_y = MATRIX_ROW (desired_matrix, new_line)->y; | |
4945 run->nrows = 1; | |
4946 run->height = MATRIX_ROW (current_matrix, i)->height; | |
4947 | |
4948 /* Extend backward. */ | |
4949 j = i - 1; | |
4950 k = new_line - 1; | |
4951 while (j > first_old | |
4952 && k > first_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4953 && old_lines[j] == new_lines[k]) |
25012 | 4954 { |
4955 int h = MATRIX_ROW (current_matrix, j)->height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4956 --run->current_vpos; |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4957 --run->desired_vpos; |
25012 | 4958 ++run->nrows; |
4959 run->height += h; | |
4960 run->desired_y -= h; | |
4961 run->current_y -= h; | |
4962 --j, --k; | |
4963 } | |
4964 | |
4965 /* Extend forward. */ | |
4966 j = i + 1; | |
4967 k = new_line + 1; | |
4968 while (j < last_old | |
4969 && k < last_new | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
4970 && old_lines[j] == new_lines[k]) |
25012 | 4971 { |
4972 int h = MATRIX_ROW (current_matrix, j)->height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
4973 ++run->nrows; |
25012 | 4974 run->height += h; |
4975 ++j, ++k; | |
4976 } | |
4977 | |
4978 /* Insert run into list of all runs. Order runs by copied | |
4979 pixel lines. Note that we record runs that don't have to | |
4980 be copied because they are already in place. This is done | |
4981 because we can avoid calling update_window_line in this | |
4982 case. */ | |
4983 for (j = 0; j < nruns && runs[j]->height > run->height; ++j) | |
4984 ; | |
34203
e55480843a8e
(scrolling_window): Fix code inserting runs in list of all runs.
Gerd Moellmann <gerd@gnu.org>
parents:
33763
diff
changeset
|
4985 for (k = nruns; k > j; --k) |
25012 | 4986 runs[k] = runs[k - 1]; |
4987 runs[j] = run; | |
4988 ++nruns; | |
4989 | |
4990 i += run->nrows; | |
4991 } | |
4992 else | |
4993 ++i; | |
4994 | |
4995 /* Do the moves. Do it in a way that we don't overwrite something | |
4996 we want to copy later on. This is not solvable in general | |
4997 because there is only one display and we don't have a way to | |
4998 exchange areas on this display. Example: | |
4999 | |
5000 +-----------+ +-----------+ | |
5001 | A | | B | | |
5002 +-----------+ --> +-----------+ | |
5003 | B | | A | | |
5004 +-----------+ +-----------+ | |
5005 | |
5006 Instead, prefer bigger moves, and invalidate moves that would | |
5007 copy from where we copied to. */ | |
5008 | |
5009 for (i = 0; i < nruns; ++i) | |
5010 if (runs[i]->nrows > 0) | |
5011 { | |
5012 struct run *r = runs[i]; | |
5013 | |
5014 /* Copy on the display. */ | |
5015 if (r->current_y != r->desired_y) | |
5016 { | |
5017 rif->scroll_run_hook (w, r); | |
5018 | |
5019 /* Invalidate runs that copy from where we copied to. */ | |
5020 for (j = i + 1; j < nruns; ++j) | |
5021 { | |
5022 struct run *p = runs[j]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5023 |
25012 | 5024 if ((p->current_y >= r->desired_y |
5025 && p->current_y < r->desired_y + r->height) | |
5026 || (p->current_y + p->height >= r->desired_y | |
5027 && (p->current_y + p->height | |
5028 < r->desired_y + r->height))) | |
5029 p->nrows = 0; | |
5030 } | |
5031 } | |
5032 | |
5033 /* Assign matrix rows. */ | |
5034 for (j = 0; j < r->nrows; ++j) | |
5035 { | |
5036 struct glyph_row *from, *to; | |
25186
d6c941334567
(redraw_overlapping_rows): Use flag overlapping_p.
Gerd Moellmann <gerd@gnu.org>
parents:
25118
diff
changeset
|
5037 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
|
5038 |
25012 | 5039 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
|
5040 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
|
5041 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
|
5042 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
|
5043 && (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
|
5044 || 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
|
5045 || 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
|
5046 || to->right_fringe_face_id != from->right_fringe_face_id |
ccacbf7f76b2
(row_equal_p): Compare fringe bitmap faces and overlay
Kim F. Storm <storm@cua.dk>
parents:
53612
diff
changeset
|
5047 || to->overlay_arrow_p != from->overlay_arrow_p)) |
53605
7dfd96e25ec6
(row_equal_p, update_window_line): Compare fringe bitmaps
Kim F. Storm <storm@cua.dk>
parents:
53514
diff
changeset
|
5048 from->redraw_fringe_bitmaps_p = 1; |
25012 | 5049 assign_row (to, from); |
5050 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
|
5051 to->overlapped_p = to_overlapped_p; |
25012 | 5052 } |
5053 } | |
5054 | |
29980
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5055 /* Clear the hash table, for the next time. */ |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5056 for (i = 0; i < row_entry_idx; ++i) |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5057 row_table[row_entry_pool[i].bucket] = NULL; |
171ba59e1cb0
(struct row_entry): New structure.
Gerd Moellmann <gerd@gnu.org>
parents:
29687
diff
changeset
|
5058 |
25012 | 5059 /* Value is non-zero to indicate that we scrolled the display. */ |
5060 return 1; | |
5061 } | |
5062 | |
5063 | |
5064 | |
5065 /************************************************************************ | |
5066 Frame-Based Updates | |
5067 ************************************************************************/ | |
5068 | |
5069 /* Update the desired frame matrix of frame F. | |
5070 | |
5071 FORCE_P non-zero means that the update should not be stopped by | |
5072 pending input. INHIBIT_HAIRY_ID_P non-zero means that scrolling | |
5073 should not be tried. | |
5074 | |
5075 Value is non-zero if update was stopped due to pending input. */ | |
5076 | |
5077 static int | |
5078 update_frame_1 (f, force_p, inhibit_id_p) | |
5079 struct frame *f; | |
5080 int force_p; | |
5081 int inhibit_id_p; | |
5082 { | |
5083 /* Frame matrices to work on. */ | |
5084 struct glyph_matrix *current_matrix = f->current_matrix; | |
5085 struct glyph_matrix *desired_matrix = f->desired_matrix; | |
5086 int i; | |
314 | 5087 int pause; |
5088 int preempt_count = baud_rate / 2400 + 1; | |
21514 | 5089 extern int input_pending; |
25012 | 5090 |
5091 xassert (current_matrix && desired_matrix); | |
314 | 5092 |
10122
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5093 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
|
5094 calculate_costs (f); |
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
5095 |
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5096 if (preempt_count <= 0) |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5097 preempt_count = 1; |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
5098 |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5099 if (redisplay_dont_pause) |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5100 force_p = 1; |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
5101 else if (!force_p && detect_input_pending ()) |
314 | 5102 { |
5103 pause = 1; | |
5104 goto do_pause; | |
5105 } | |
5106 | |
25012 | 5107 /* If we cannot insert/delete lines, it's no use trying it. */ |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5108 if (!FRAME_LINE_INS_DEL_OK (f)) |
25012 | 5109 inhibit_id_p = 1; |
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
5110 |
493 | 5111 /* See if any of the desired lines are enabled; don't compute for |
25012 | 5112 i/d line if just want cursor motion. */ |
5113 for (i = 0; i < desired_matrix->nrows; i++) | |
5114 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) | |
314 | 5115 break; |
5116 | |
5117 /* Try doing i/d line, if not yet inhibited. */ | |
25012 | 5118 if (!inhibit_id_p && i < desired_matrix->nrows) |
5119 force_p |= scrolling (f); | |
314 | 5120 |
5121 /* Update the individual lines as needed. Do bottom line first. */ | |
25012 | 5122 if (MATRIX_ROW_ENABLED_P (desired_matrix, desired_matrix->nrows - 1)) |
5123 update_frame_line (f, desired_matrix->nrows - 1); | |
5124 | |
5125 /* Now update the rest of the lines. */ | |
5126 for (i = 0; i < desired_matrix->nrows - 1 && (force_p || !input_pending); i++) | |
314 | 5127 { |
25012 | 5128 if (MATRIX_ROW_ENABLED_P (desired_matrix, i)) |
314 | 5129 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
5130 if (FRAME_TERMCAP_P (f)) |
314 | 5131 { |
5132 /* Flush out every so many lines. | |
5133 Also flush out if likely to have more than 1k buffered | |
5134 otherwise. I'm told that some telnet connections get | |
5135 really screwed by more than 1k output at once. */ | |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
5136 int outq = PENDING_OUTPUT_COUNT (TTY_OUTPUT (FRAME_TTY (f))); |
314 | 5137 if (outq > 900 |
5138 || (outq > 20 && ((i - 1) % preempt_count == 0))) | |
5139 { | |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
5140 fflush (TTY_OUTPUT (FRAME_TTY (f))); |
314 | 5141 if (preempt_count == 1) |
5142 { | |
554 | 5143 #ifdef EMACS_OUTQSIZE |
5144 if (EMACS_OUTQSIZE (0, &outq) < 0) | |
314 | 5145 /* 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
|
5146 the outq count. */ |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
5147 outq = PENDING_OUTPUT_COUNT (TTY_OUTPUT (FRAME_TTY (f))); |
314 | 5148 #endif |
5149 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
|
5150 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
|
5151 sleep (outq / baud_rate); |
314 | 5152 } |
5153 } | |
5154 } | |
5155 | |
16822
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5156 if ((i - 1) % preempt_count == 0) |
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5157 detect_input_pending (); |
483e137d5384
(update_frame): Call detect_input_pending
Richard M. Stallman <rms@gnu.org>
parents:
16589
diff
changeset
|
5158 |
25012 | 5159 update_frame_line (f, i); |
314 | 5160 } |
5161 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5162 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5163 pause = (i < FRAME_LINES (f) - 1) ? i : 0; |
314 | 5164 |
5165 /* Now just clean up termcap drivers and set cursor, etc. */ | |
5166 if (!pause) | |
5167 { | |
12409
6e374b28ecc3
(update_frame): Pretend cursor is in echo area
Richard M. Stallman <rms@gnu.org>
parents:
12193
diff
changeset
|
5168 if ((cursor_in_echo_area |
25012 | 5169 /* 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
|
5170 show the cursor for the message instead of for the |
25012 | 5171 (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
|
5172 || (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
|
5173 && EQ (minibuf_window, echo_area_window) |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
5174 && !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
|
5175 /* These cases apply only to the frame that contains |
25012 | 5176 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
|
5177 && FRAME_HAS_MINIBUF_P (f) |
14459
c1d25453a95f
(update_frame): Compare FRAME_MINIBUF_WINDOW(f)
Richard M. Stallman <rms@gnu.org>
parents:
14286
diff
changeset
|
5178 && EQ (FRAME_MINIBUF_WINDOW (f), echo_area_window)) |
708 | 5179 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5180 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
|
5181 int row, col; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5182 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5183 if (cursor_in_echo_area < 0) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5184 { |
25012 | 5185 /* Negative value of cursor_in_echo_area means put |
5186 cursor at beginning of line. */ | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5187 row = top; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5188 col = 0; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5189 } |
708 | 5190 else |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5191 { |
25012 | 5192 /* Positive value of cursor_in_echo_area means put |
5193 cursor at the end of the prompt. If the mini-buffer | |
5194 is several lines high, find the last line that has | |
5195 any text on it. */ | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5196 row = FRAME_LINES (f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5197 do |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5198 { |
25012 | 5199 --row; |
5200 col = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5201 |
25012 | 5202 if (MATRIX_ROW_ENABLED_P (current_matrix, row)) |
5203 { | |
5204 /* Frame rows are filled up with spaces that | |
5205 must be ignored here. */ | |
5206 struct glyph_row *r = MATRIX_ROW (current_matrix, | |
5207 row); | |
5208 struct glyph *start = r->glyphs[TEXT_AREA]; | |
5209 struct glyph *last = start + r->used[TEXT_AREA]; | |
5210 | |
5211 while (last > start | |
5212 && (last - 1)->charpos < 0) | |
5213 --last; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5214 |
25012 | 5215 col = last - start; |
5216 } | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5217 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5218 while (row > top && col == 0); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5219 |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5220 /* 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
|
5221 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
|
5222 { |
21757
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5223 /* 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
|
5224 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
|
5225 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5226 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
|
5227 row++; |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5228 } |
629f6df4a329
(update_frame): Move echo area cursor into range.
Richard M. Stallman <rms@gnu.org>
parents:
21514
diff
changeset
|
5229 /* 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
|
5230 else |
21763
b685f9451792
(change_frame_size_1): Use FRAME_CURSOR_X_LIMIT.
Richard M. Stallman <rms@gnu.org>
parents:
21757
diff
changeset
|
5231 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
|
5232 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5233 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5234 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
5235 cursor_to (row, col); |
708 | 5236 } |
314 | 5237 else |
25012 | 5238 { |
5239 /* We have only one cursor on terminal frames. Use it to | |
5240 display the cursor of the selected window. */ | |
5241 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
|
5242 if (w->cursor.vpos >= 0 |
5d67ef29764b
(update_frame_1): Handle case that cursor vpos is
Gerd Moellmann <gerd@gnu.org>
parents:
29437
diff
changeset
|
5243 /* 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
|
5244 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
|
5245 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
|
5246 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
|
5247 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
|
5248 && w->cursor.vpos < WINDOW_TOTAL_LINES (w)) |
25012 | 5249 { |
5250 int x = WINDOW_TO_FRAME_HPOS (w, w->cursor.hpos); | |
5251 int y = WINDOW_TO_FRAME_VPOS (w, w->cursor.vpos); | |
5252 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5253 if (INTEGERP (w->left_margin_cols)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5254 x += XFASTINT (w->left_margin_cols); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5255 |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5256 /* x = max (min (x, FRAME_TOTAL_COLS (f) - 1), 0); */ |
25012 | 5257 cursor_to (y, x); |
5258 } | |
5259 } | |
314 | 5260 } |
5261 | |
5262 do_pause: | |
5263 | |
25012 | 5264 clear_desired_matrices (f); |
314 | 5265 return pause; |
5266 } | |
5267 | |
25012 | 5268 |
5269 /* Do line insertions/deletions on frame F for frame-based redisplay. */ | |
314 | 5270 |
21514 | 5271 int |
764 | 5272 scrolling (frame) |
25012 | 5273 struct frame *frame; |
314 | 5274 { |
5275 int unchanged_at_top, unchanged_at_bottom; | |
5276 int window_size; | |
5277 int changed_lines; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5278 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
|
5279 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
|
5280 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
|
5281 int *old_draw_cost = (int *) alloca (FRAME_LINES (frame) * sizeof (int)); |
314 | 5282 register int i; |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5283 int free_at_end_vpos = FRAME_LINES (frame); |
25012 | 5284 struct glyph_matrix *current_matrix = frame->current_matrix; |
5285 struct glyph_matrix *desired_matrix = frame->desired_matrix; | |
5286 | |
5287 if (!current_matrix) | |
5288 abort (); | |
5289 | |
5290 /* Compute hash codes of all the lines. Also calculate number of | |
5291 changed lines, number of unchanged lines at the beginning, and | |
5292 number of unchanged lines at the end. */ | |
314 | 5293 changed_lines = 0; |
5294 unchanged_at_top = 0; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5295 unchanged_at_bottom = FRAME_LINES (frame); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5296 for (i = 0; i < FRAME_LINES (frame); i++) |
314 | 5297 { |
5298 /* Give up on this scrolling if some old lines are not enabled. */ | |
25012 | 5299 if (!MATRIX_ROW_ENABLED_P (current_matrix, i)) |
314 | 5300 return 0; |
25012 | 5301 old_hash[i] = line_hash_code (MATRIX_ROW (current_matrix, i)); |
5302 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
|
5303 { |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5304 /* 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
|
5305 new_hash[i] = old_hash[i]; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5306 #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
|
5307 draw_cost[i] = INFINITY; |
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5308 } |
314 | 5309 else |
18015
934a44a3b34f
(scrolling): If a line is not enabled,
Richard M. Stallman <rms@gnu.org>
parents:
17961
diff
changeset
|
5310 { |
25012 | 5311 new_hash[i] = line_hash_code (MATRIX_ROW (desired_matrix, i)); |
5312 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
|
5313 } |
314 | 5314 |
5315 if (old_hash[i] != new_hash[i]) | |
5316 { | |
5317 changed_lines++; | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5318 unchanged_at_bottom = FRAME_LINES (frame) - i - 1; |
314 | 5319 } |
5320 else if (i == unchanged_at_top) | |
5321 unchanged_at_top++; | |
25012 | 5322 old_draw_cost[i] = line_draw_cost (current_matrix, i); |
314 | 5323 } |
5324 | |
5325 /* If changed lines are few, don't allow preemption, don't scroll. */ | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5326 if ((!FRAME_SCROLL_REGION_OK (frame) |
53225
4250e7e26247
Add a level of indirection to terminal characteristics.
Karoly Lorentey <lorentey@elte.hu>
parents:
53190
diff
changeset
|
5327 && changed_lines < baud_rate / 2400) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5328 || unchanged_at_bottom == FRAME_LINES (frame)) |
314 | 5329 return 1; |
5330 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5331 window_size = (FRAME_LINES (frame) - unchanged_at_top |
314 | 5332 - unchanged_at_bottom); |
5333 | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5334 if (FRAME_SCROLL_REGION_OK (frame)) |
314 | 5335 free_at_end_vpos -= unchanged_at_bottom; |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5336 else if (FRAME_MEMORY_BELOW_FRAME (frame)) |
314 | 5337 free_at_end_vpos = -1; |
5338 | |
5339 /* If large window, fast terminal and few lines in common between | |
25012 | 5340 current frame and desired frame, don't bother with i/d calc. */ |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5341 if (!FRAME_SCROLL_REGION_OK (frame) |
53225
4250e7e26247
Add a level of indirection to terminal characteristics.
Karoly Lorentey <lorentey@elte.hu>
parents:
53190
diff
changeset
|
5342 && window_size >= 18 && baud_rate > 2400 |
314 | 5343 && (window_size >= |
5344 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
|
5345 FRAME_LINES (frame) - unchanged_at_bottom, |
314 | 5346 old_hash, new_hash, draw_cost))) |
5347 return 0; | |
5348 | |
25012 | 5349 if (window_size < 2) |
5350 return 0; | |
5351 | |
764 | 5352 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, |
314 | 5353 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
|
5354 old_draw_cost + unchanged_at_top - 1, |
314 | 5355 old_hash + unchanged_at_top - 1, |
5356 new_hash + unchanged_at_top - 1, | |
5357 free_at_end_vpos - unchanged_at_top); | |
5358 | |
5359 return 0; | |
5360 } | |
25012 | 5361 |
5362 | |
5363 /* Count the number of blanks at the start of the vector of glyphs R | |
5364 which is LEN glyphs long. */ | |
5365 | |
5366 static int | |
5367 count_blanks (r, len) | |
5368 struct glyph *r; | |
5369 int len; | |
314 | 5370 { |
25012 | 5371 int i; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5372 |
25012 | 5373 for (i = 0; i < len; ++i) |
5374 if (!CHAR_GLYPH_SPACE_P (r[i])) | |
5375 break; | |
5376 | |
5377 return i; | |
314 | 5378 } |
25012 | 5379 |
5380 | |
5381 /* Count the number of glyphs in common at the start of the glyph | |
5382 vectors STR1 and STR2. END1 is the end of STR1 and END2 is the end | |
5383 of STR2. Value is the number of equal glyphs equal at the start. */ | |
314 | 5384 |
5385 static int | |
25012 | 5386 count_match (str1, end1, str2, end2) |
5387 struct glyph *str1, *end1, *str2, *end2; | |
314 | 5388 { |
25012 | 5389 struct glyph *p1 = str1; |
5390 struct glyph *p2 = str2; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5391 |
25012 | 5392 while (p1 < end1 |
5393 && p2 < end2 | |
26998
02e902f732d1
(line_hash_code) (direct_output_for_insert): Adjusted
Kenichi Handa <handa@m17n.org>
parents:
26902
diff
changeset
|
5394 && GLYPH_CHAR_AND_FACE_EQUAL_P (p1, p2)) |
25012 | 5395 ++p1, ++p2; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5396 |
25012 | 5397 return p1 - str1; |
314 | 5398 } |
5399 | |
25012 | 5400 |
314 | 5401 /* Char insertion/deletion cost vector, from term.c */ |
25012 | 5402 |
314 | 5403 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
|
5404 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_TOTAL_COLS((f))]) |
314 | 5405 |
25012 | 5406 |
5407 /* Perform a frame-based update on line VPOS in frame FRAME. */ | |
5408 | |
314 | 5409 static void |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5410 update_frame_line (f, vpos) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5411 struct frame *f; |
314 | 5412 int vpos; |
5413 { | |
25012 | 5414 struct glyph *obody, *nbody, *op1, *op2, *np1, *nend; |
314 | 5415 int tem; |
5416 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
|
5417 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
|
5418 struct glyph_matrix *desired_matrix = f->desired_matrix; |
25012 | 5419 struct glyph_row *current_row = MATRIX_ROW (current_matrix, vpos); |
5420 struct glyph_row *desired_row = MATRIX_ROW (desired_matrix, vpos); | |
5421 int must_write_whole_line_p; | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5422 int write_spaces_p = FRAME_MUST_WRITE_SPACES (f); |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5423 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
|
5424 != FACE_TTY_DEFAULT_BG_COLOR); |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5425 |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5426 if (colored_spaces_p) |
39cd5f99c67d
(update_frame_line): Handle case where spaces in
Gerd Moellmann <gerd@gnu.org>
parents:
32752
diff
changeset
|
5427 write_spaces_p = 1; |
25012 | 5428 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5429 /* 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
|
5430 write the whole desired line in that case. */ |
25012 | 5431 must_write_whole_line_p = !current_row->enabled_p; |
5432 if (must_write_whole_line_p) | |
314 | 5433 { |
25012 | 5434 obody = 0; |
314 | 5435 olen = 0; |
5436 } | |
5437 else | |
5438 { | |
25012 | 5439 obody = MATRIX_ROW_GLYPH_START (current_matrix, vpos); |
5440 olen = current_row->used[TEXT_AREA]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5441 |
40075
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5442 /* 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
|
5443 if (!write_spaces_p) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5444 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
|
5445 olen--; |
314 | 5446 } |
5447 | |
25012 | 5448 current_row->enabled_p = 1; |
5449 current_row->used[TEXT_AREA] = desired_row->used[TEXT_AREA]; | |
5450 | |
5451 /* If desired line is empty, just clear the line. */ | |
5452 if (!desired_row->enabled_p) | |
314 | 5453 { |
5454 nlen = 0; | |
5455 goto just_erase; | |
5456 } | |
5457 | |
25012 | 5458 nbody = desired_row->glyphs[TEXT_AREA]; |
5459 nlen = desired_row->used[TEXT_AREA]; | |
5460 nend = nbody + nlen; | |
5461 | |
5462 /* If display line has unknown contents, write the whole line. */ | |
5463 if (must_write_whole_line_p) | |
5464 { | |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5465 /* 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
|
5466 if (!write_spaces_p) |
25313
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5467 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
|
5468 --nlen; |
6b4475fbef86
(update_frame_line): If writing whole line,
Gerd Moellmann <gerd@gnu.org>
parents:
25304
diff
changeset
|
5469 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5470 /* 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
|
5471 if (nlen) |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5472 { |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5473 cursor_to (vpos, 0); |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5474 write_glyphs (nbody, nlen); |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5475 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5476 |
25725
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5477 /* 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
|
5478 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
|
5479 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
|
5480 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
|
5481 { |
b7468dc89ccb
(update_frame_line): If writing whole desired line,
Gerd Moellmann <gerd@gnu.org>
parents:
25666
diff
changeset
|
5482 cursor_to (vpos, nlen); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5483 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
|
5484 } |
28682
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5485 else |
f05d48759416
(update_frame_line): When writing a whole line, make
Gerd Moellmann <gerd@gnu.org>
parents:
28507
diff
changeset
|
5486 /* 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
|
5487 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
|
5488 cursor_to (vpos, 0); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5489 |
25012 | 5490 make_current (desired_matrix, current_matrix, vpos); |
5491 return; | |
5492 } | |
314 | 5493 |
5494 /* Pretend trailing spaces are not there at all, | |
5495 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
|
5496 if (!write_spaces_p) |
c1d88076fa85
(update_frame_line): Don't call reassert_line_highlight.
Miles Bader <miles@gnu.org>
parents:
39988
diff
changeset
|
5497 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
|
5498 nlen--; |
314 | 5499 |
5500 /* If there's no i/d char, quickly do the best we can without it. */ | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5501 if (!FRAME_CHAR_INS_DEL_OK (f)) |
314 | 5502 { |
25012 | 5503 int i, j; |
5504 | |
5505 /* Find the first glyph in desired row that doesn't agree with | |
5506 a glyph in the current row, and write the rest from there on. */ | |
314 | 5507 for (i = 0; i < nlen; i++) |
5508 { | |
25012 | 5509 if (i >= olen || !GLYPH_EQUAL_P (nbody + i, obody + i)) |
314 | 5510 { |
25012 | 5511 /* Find the end of the run of different glyphs. */ |
5512 j = i + 1; | |
5513 while (j < nlen | |
5514 && (j >= olen | |
5515 || !GLYPH_EQUAL_P (nbody + j, obody + j) | |
5516 || CHAR_GLYPH_PADDING_P (nbody[j]))) | |
5517 ++j; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5518 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5519 /* Output this run of non-matching chars. */ |
314 | 5520 cursor_to (vpos, i); |
25012 | 5521 write_glyphs (nbody + i, j - i); |
5522 i = j - 1; | |
314 | 5523 |
5524 /* Now find the next non-match. */ | |
5525 } | |
5526 } | |
5527 | |
5528 /* Clear the rest of the line, or the non-clear part of it. */ | |
5529 if (olen > nlen) | |
5530 { | |
5531 cursor_to (vpos, nlen); | |
5532 clear_end_of_line (olen); | |
5533 } | |
5534 | |
25012 | 5535 /* Make current row = desired row. */ |
5536 make_current (desired_matrix, current_matrix, vpos); | |
314 | 5537 return; |
5538 } | |
5539 | |
25012 | 5540 /* Here when CHAR_INS_DEL_OK != 0, i.e. we can insert or delete |
5541 characters in a row. */ | |
5542 | |
314 | 5543 if (!olen) |
5544 { | |
25012 | 5545 /* If current line is blank, skip over initial spaces, if |
5546 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
|
5547 if (write_spaces_p) |
25012 | 5548 nsp = 0; |
5549 else | |
5550 nsp = count_blanks (nbody, nlen); | |
5551 | |
314 | 5552 if (nlen > nsp) |
5553 { | |
5554 cursor_to (vpos, nsp); | |
5555 write_glyphs (nbody + nsp, nlen - nsp); | |
5556 } | |
5557 | |
764 | 5558 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5559 make_current (desired_matrix, current_matrix, vpos); |
314 | 5560 return; |
5561 } | |
5562 | |
5563 /* Compute number of leading blanks in old and new contents. */ | |
25012 | 5564 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
|
5565 nsp = (colored_spaces_p ? 0 : count_blanks (nbody, nlen)); |
25012 | 5566 |
5567 /* Compute number of matching chars starting with first non-blank. */ | |
5568 begmatch = count_match (obody + osp, obody + olen, | |
5569 nbody + nsp, nbody + nlen); | |
314 | 5570 |
5571 /* Spaces in new match implicit space past the end of old. */ | |
5572 /* 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
|
5573 if (!write_spaces_p && osp + begmatch == olen) |
314 | 5574 { |
5575 np1 = nbody + nsp; | |
25012 | 5576 while (np1 + begmatch < nend && CHAR_GLYPH_SPACE_P (np1[begmatch])) |
5577 ++begmatch; | |
314 | 5578 } |
5579 | |
5580 /* Avoid doing insert/delete char | |
5581 just cause number of leading spaces differs | |
25012 | 5582 when the following text does not match. */ |
314 | 5583 if (begmatch == 0 && osp != nsp) |
5584 osp = nsp = min (osp, nsp); | |
5585 | |
5586 /* Find matching characters at end of line */ | |
5587 op1 = obody + olen; | |
5588 np1 = nbody + nlen; | |
5589 op2 = op1 + begmatch - min (olen - osp, nlen - nsp); | |
25012 | 5590 while (op1 > op2 |
5591 && GLYPH_EQUAL_P (op1 - 1, np1 - 1)) | |
314 | 5592 { |
5593 op1--; | |
5594 np1--; | |
5595 } | |
5596 endmatch = obody + olen - op1; | |
5597 | |
5598 /* tem gets the distance to insert or delete. | |
5599 endmatch is how many characters we save by doing so. | |
5600 Is it worth it? */ | |
5601 | |
5602 tem = (nlen - nsp) - (olen - osp); | |
5603 if (endmatch && tem | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5604 && (!FRAME_CHAR_INS_DEL_OK (f) |
53225
4250e7e26247
Add a level of indirection to terminal characteristics.
Karoly Lorentey <lorentey@elte.hu>
parents:
53190
diff
changeset
|
5605 || endmatch <= char_ins_del_cost (f)[tem])) |
314 | 5606 endmatch = 0; |
5607 | |
5608 /* nsp - osp is the distance to insert or delete. | |
5609 If that is nonzero, begmatch is known to be nonzero also. | |
5610 begmatch + endmatch is how much we save by doing the ins/del. | |
5611 Is it worth it? */ | |
5612 | |
5613 if (nsp != osp | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
5614 && (!FRAME_CHAR_INS_DEL_OK (f) |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5615 || begmatch + endmatch <= char_ins_del_cost (f)[nsp - osp])) |
314 | 5616 { |
5617 begmatch = 0; | |
5618 endmatch = 0; | |
5619 osp = nsp = min (osp, nsp); | |
5620 } | |
5621 | |
5622 /* Now go through the line, inserting, writing and | |
5623 deleting as appropriate. */ | |
5624 | |
5625 if (osp > nsp) | |
5626 { | |
5627 cursor_to (vpos, nsp); | |
5628 delete_glyphs (osp - nsp); | |
5629 } | |
5630 else if (nsp > osp) | |
5631 { | |
5632 /* If going to delete chars later in line | |
5633 and insert earlier in the line, | |
5634 must delete first to avoid losing data in the insert */ | |
5635 if (endmatch && nlen < olen + nsp - osp) | |
5636 { | |
5637 cursor_to (vpos, nlen - endmatch + osp - nsp); | |
5638 delete_glyphs (olen + nsp - osp - nlen); | |
5639 olen = nlen - (nsp - osp); | |
5640 } | |
5641 cursor_to (vpos, osp); | |
25012 | 5642 insert_glyphs (0, nsp - osp); |
314 | 5643 } |
5644 olen += nsp - osp; | |
5645 | |
5646 tem = nsp + begmatch + endmatch; | |
5647 if (nlen != tem || olen != tem) | |
5648 { | |
5649 if (!endmatch || nlen == olen) | |
5650 { | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5651 /* 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
|
5652 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
|
5653 (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
|
5654 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
|
5655 if (nlen == FRAME_TOTAL_COLS (f)) |
314 | 5656 olen = 0; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5657 |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5658 /* 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
|
5659 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
|
5660 unnecessary cursor movement. */ |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5661 if (nlen - tem > 0) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5662 { |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5663 cursor_to (vpos, nsp + begmatch); |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5664 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
|
5665 } |
314 | 5666 } |
5667 else if (nlen > olen) | |
5668 { | |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5669 /* 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
|
5670 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5671 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
|
5672 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
|
5673 ---------------------------------------- |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5674 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
|
5675 is a padding glyph. */ |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5676 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
|
5677 int del; |
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5678 |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5679 cursor_to (vpos, nsp + begmatch); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5680 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5681 /* 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
|
5682 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
|
5683 out--; |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5684 write_glyphs (nbody + nsp + begmatch, out); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5685 |
25012 | 5686 /* 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
|
5687 del = olen - tem - out; |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5688 if (del > 0) |
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5689 delete_glyphs (del); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5690 |
17015
fe0b3661b584
(direct_output_forward_char): #if-0-out redundant
Karl Heuer <kwzh@gnu.org>
parents:
16896
diff
changeset
|
5691 /* 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
|
5692 insert_glyphs (nbody + nsp + begmatch + out, nlen - olen + del); |
314 | 5693 olen = nlen; |
5694 } | |
5695 else if (olen > nlen) | |
5696 { | |
35924
32198b7c21e1
(update_frame_line): Rename parameter FRAME to F.
Gerd Moellmann <gerd@gnu.org>
parents:
35609
diff
changeset
|
5697 cursor_to (vpos, nsp + begmatch); |
314 | 5698 write_glyphs (nbody + nsp + begmatch, nlen - tem); |
5699 delete_glyphs (olen - nlen); | |
5700 olen = nlen; | |
5701 } | |
5702 } | |
5703 | |
5704 just_erase: | |
5705 /* If any unerased characters remain after the new line, erase them. */ | |
5706 if (olen > nlen) | |
5707 { | |
5708 cursor_to (vpos, nlen); | |
5709 clear_end_of_line (olen); | |
5710 } | |
5711 | |
764 | 5712 /* Exchange contents between current_frame and new_frame. */ |
25012 | 5713 make_current (desired_matrix, current_matrix, vpos); |
314 | 5714 } |
25012 | 5715 |
5716 | |
314 | 5717 |
25012 | 5718 /*********************************************************************** |
5719 X/Y Position -> Buffer Position | |
5720 ***********************************************************************/ | |
5721 | |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5722 /* 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
|
5723 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
|
5724 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
|
5725 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
|
5726 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5727 Lisp_Object |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5728 buffer_posn_from_coords (w, x, y, pos, object, dx, dy, width, height) |
25012 | 5729 struct window *w; |
5730 int *x, *y; | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5731 struct display_pos *pos; |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5732 Lisp_Object *object; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5733 int *dx, *dy; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5734 int *width, *height; |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5735 { |
25012 | 5736 struct it it; |
5737 struct buffer *old_current_buffer = current_buffer; | |
5738 struct text_pos startp; | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5739 Lisp_Object string; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5740 struct glyph_row *row; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5741 int x0, x1; |
25012 | 5742 |
5743 current_buffer = XBUFFER (w->buffer); | |
5744 SET_TEXT_POS_FROM_MARKER (startp, w->start); | |
5745 CHARPOS (startp) = min (ZV, max (BEGV, CHARPOS (startp))); | |
5746 BYTEPOS (startp) = min (ZV_BYTE, max (BEGV_BYTE, BYTEPOS (startp))); | |
5747 start_display (&it, w, startp); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5748 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5749 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
|
5750 move_it_to (&it, -1, x0 + it.first_visible_x, *y, -1, |
25012 | 5751 MOVE_TO_X | MOVE_TO_Y); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
5752 |
25012 | 5753 current_buffer = old_current_buffer; |
36697
7526acd3385c
(buffer_posn_from_coords): Add parameters OBJECT and
Gerd Moellmann <gerd@gnu.org>
parents:
36590
diff
changeset
|
5754 |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5755 *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
|
5756 *dy = *y - it.current_y; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5757 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5758 string = w->buffer; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5759 if (STRINGP (it.string)) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5760 string = it.string; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5761 *pos = it.current; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5762 |
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
|
5763 #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
|
5764 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
|
5765 { |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5766 struct image *img; |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5767 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
|
5768 && !NILP (img->spec)) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5769 *object = img->spec; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5770 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5771 #endif |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5772 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5773 row = MATRIX_ROW (w->current_matrix, it.vpos); |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5774 if (row->enabled_p) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5775 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5776 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
|
5777 { |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5778 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
|
5779 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5780 *height = glyph->ascent + glyph->descent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5781 #ifdef HAVE_WINDOW_SYSTEM |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5782 if (glyph->type == IMAGE_GLYPH) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5783 *dy -= row->ascent - glyph->ascent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5784 #endif |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5785 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5786 else |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5787 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5788 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5789 *height = row->height; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5790 } |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5791 } |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5792 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5793 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5794 *width = *height = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5795 } |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5796 |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5797 /* 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
|
5798 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
|
5799 if (x0 > x1) |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5800 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
|
5801 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5802 *x = it.hpos; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5803 *y = it.vpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5804 |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5805 return string; |
25012 | 5806 } |
5807 | |
5808 | |
5809 /* 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
|
5810 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
|
5811 *CHARPOS is set to the position in the string returned. */ |
25012 | 5812 |
5813 Lisp_Object | |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5814 mode_line_string (w, part, x, y, charpos, object, dx, dy, width, height) |
25012 | 5815 struct window *w; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5816 enum window_part part; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5817 int *x, *y; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5818 int *charpos; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5819 Lisp_Object *object; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5820 int *dx, *dy; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5821 int *width, *height; |
25012 | 5822 { |
5823 struct glyph_row *row; | |
5824 struct glyph *glyph, *end; | |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5825 int x0, y0; |
25012 | 5826 Lisp_Object string = Qnil; |
5827 | |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5828 if (part == ON_MODE_LINE) |
25012 | 5829 row = MATRIX_MODE_LINE_ROW (w->current_matrix); |
5830 else | |
25546 | 5831 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
|
5832 y0 = *y - row->y; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5833 *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
|
5834 |
25012 | 5835 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
|
5836 { |
25012 | 5837 /* Find the glyph under X. If we find one with a string object, |
5838 it's the one we were looking for. */ | |
5839 glyph = row->glyphs[TEXT_AREA]; | |
5840 end = glyph + row->used[TEXT_AREA]; | |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5841 for (x0 = *x; glyph < end && x0 > glyph->pixel_width; ++glyph) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5842 x0 -= glyph->pixel_width; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5843 *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
|
5844 if (glyph < end) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5845 { |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5846 string = glyph->object; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5847 *charpos = glyph->charpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5848 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5849 *height = glyph->ascent + glyph->descent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5850 #ifdef HAVE_WINDOW_SYSTEM |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5851 if (glyph->type == IMAGE_GLYPH) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5852 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5853 struct image *img; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5854 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
|
5855 if (img != NULL) |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5856 *object = img->spec; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5857 y0 -= row->ascent - glyph->ascent; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5858 } |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5859 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5860 } |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5861 else |
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 /* 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
|
5864 *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
|
5865 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5866 *height = row->height; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5867 } |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5868 } |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5869 else |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5870 { |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5871 *x = 0; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5872 x0 = 0; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5873 *width = *height = 0; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5874 } |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5875 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5876 *dx = x0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5877 *dy = y0; |
25012 | 5878 |
5879 return string; | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
5880 } |
25012 | 5881 |
5882 | |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5883 /* 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
|
5884 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
|
5885 the string returned. */ |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5886 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5887 Lisp_Object |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5888 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
|
5889 struct window *w; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5890 enum window_part part; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5891 int *x, *y; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5892 int *charpos; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5893 Lisp_Object *object; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5894 int *dx, *dy; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5895 int *width, *height; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5896 { |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5897 struct glyph_row *row = w->current_matrix->rows; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5898 struct glyph *glyph, *end; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5899 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
|
5900 int area; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5901 Lisp_Object string = Qnil; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5902 |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5903 if (part == ON_LEFT_MARGIN) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5904 area = LEFT_MARGIN_AREA; |
50218
06f75553f0a4
(mode_line_string, marginal_area_string): Use enum
Kim F. Storm <storm@cua.dk>
parents:
49600
diff
changeset
|
5905 else if (part == ON_RIGHT_MARGIN) |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5906 area = RIGHT_MARGIN_AREA; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5907 else |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5908 abort (); |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5909 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5910 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
|
5911 if (wy >= row->y && wy < MATRIX_ROW_BOTTOM_Y (row)) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5912 break; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5913 y0 = *y - row->y; |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5914 *y = row - MATRIX_FIRST_TEXT_ROW (w->current_matrix); |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5915 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5916 if (row->enabled_p) |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5917 { |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5918 /* 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
|
5919 it's the one we were looking for. */ |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5920 if (area == RIGHT_MARGIN_AREA) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5921 x0 = ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5922 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5923 : WINDOW_TOTAL_FRINGE_WIDTH (w)) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5924 + 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
|
5925 + window_box_width (w, TEXT_AREA)); |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5926 else |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5927 x0 = (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5928 ? WINDOW_LEFT_FRINGE_WIDTH (w) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5929 : 0); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
5930 |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5931 glyph = row->glyphs[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5932 end = glyph + row->used[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5933 for (x0 = *x - x0; glyph < end && x0 > glyph->pixel_width; ++glyph) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5934 x0 -= glyph->pixel_width; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5935 *x = glyph - row->glyphs[area]; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5936 if (glyph < end) |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5937 { |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5938 string = glyph->object; |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5939 *charpos = glyph->charpos; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5940 *width = glyph->pixel_width; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5941 *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
|
5942 #ifdef HAVE_WINDOW_SYSTEM |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5943 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
|
5944 { |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5945 struct image *img; |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5946 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
|
5947 if (img != NULL) |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5948 *object = img->spec; |
53329
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5949 y0 -= row->ascent - glyph->ascent; |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5950 } |
9c540a878edf
(buffer_posn_from_coords): Fix calculation of dy for
Kim F. Storm <storm@cua.dk>
parents:
53190
diff
changeset
|
5951 #endif |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5952 } |
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5953 else |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5954 { |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5955 /* 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
|
5956 *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
|
5957 *width = 0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5958 *height = row->height; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5959 } |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5960 } |
53127
bc14fd4782c3
(buffer_posn_from_coords): Return actual row/column
Kim F. Storm <storm@cua.dk>
parents:
53055
diff
changeset
|
5961 else |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5962 { |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5963 x0 = 0; |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5964 *x = 0; |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5965 *width = *height = 0; |
53176
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5966 } |
b246aabe1c49
(buffer_posn_from_coords): Calculate and return pixel
Kim F. Storm <storm@cua.dk>
parents:
53127
diff
changeset
|
5967 |
53514
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5968 *dx = x0; |
db81ac8829b6
(buffer_posn_from_coords): Return both buffer/string
Kim F. Storm <storm@cua.dk>
parents:
53329
diff
changeset
|
5969 *dy = y0; |
44536
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5970 |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5971 return string; |
f7b9d913406b
(marginal_area_string): New.
Gerd Moellmann <gerd@gnu.org>
parents:
44261
diff
changeset
|
5972 } |
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 |
25012 | 5975 /*********************************************************************** |
5976 Changing Frame Sizes | |
5977 ***********************************************************************/ | |
314 | 5978 |
5979 #ifdef SIGWINCH | |
25012 | 5980 |
493 | 5981 SIGTYPE |
10745
a553a08f5785
(window_change_signal): Add ignored argument.
Richard M. Stallman <rms@gnu.org>
parents:
10259
diff
changeset
|
5982 window_change_signal (signalnum) /* If we don't have an argument, */ |
25012 | 5983 int signalnum; /* some compilers complain in signal calls. */ |
314 | 5984 { |
5985 int width, height; | |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
5986 #ifndef USE_CRT_DLL |
314 | 5987 extern int errno; |
31093
6da961dff718
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30720
diff
changeset
|
5988 #endif |
314 | 5989 int old_errno = errno; |
5990 | |
82989
f3845715a5f6
Separate frame-local, tty-dependent parameters from tty-local parameters.
Karoly Lorentey <lorentey@elte.hu>
parents:
82987
diff
changeset
|
5991 struct tty_display_info *tty; |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
5992 |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
5993 /* The frame size change obviously applies to a single |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
5994 termcap-controlled terminal, but we can't decide which. |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
5995 Therefore, we resize the frames corresponding to each tty. |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
5996 */ |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
5997 for (tty = tty_list; tty; tty = tty->next) { |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
5998 |
53341 | 5999 if (! tty->term_initted) |
6000 continue; | |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6001 |
82987
1682917e56b4
Major bugfixes and slight enhancements.
Karoly Lorentey <lorentey@elte.hu>
parents:
53341
diff
changeset
|
6002 get_tty_size (fileno (TTY_INPUT (tty)), &width, &height); |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6003 |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6004 { |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6005 Lisp_Object tail, frame; |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6006 |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6007 FOR_EACH_FRAME (tail, frame) |
82995
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6008 if (FRAME_TERMCAP_P (XFRAME (frame)) && FRAME_TTY (XFRAME (frame)) == tty) |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6009 /* Record the new sizes, but don't reallocate the data |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6010 structures now. Let that be done later outside of the |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6011 signal handler. */ |
039bd6989d29
Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents:
82992
diff
changeset
|
6012 change_frame_size (XFRAME (frame), height, width, 0, 1, 0); |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6013 } |
314 | 6014 } |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6015 |
314 | 6016 signal (SIGWINCH, window_change_signal); |
6017 errno = old_errno; | |
6018 } | |
6019 #endif /* SIGWINCH */ | |
6020 | |
6021 | |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6022 /* 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
|
6023 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
|
6024 safe to change frame sizes while a redisplay is in progress. */ |
314 | 6025 |
21514 | 6026 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6027 do_pending_window_change (safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6028 int safe; |
314 | 6029 { |
6030 /* 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
|
6031 if (redisplaying_p && !safe) |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6032 return; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6033 |
314 | 6034 while (delayed_size_change) |
6035 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6036 Lisp_Object tail, frame; |
314 | 6037 |
6038 delayed_size_change = 0; | |
6039 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
6040 FOR_EACH_FRAME (tail, frame) |
314 | 6041 { |
25012 | 6042 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
|
6043 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6044 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
|
6045 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
|
6046 0, 0, safe); |
314 | 6047 } |
6048 } | |
6049 } | |
6050 | |
6051 | |
764 | 6052 /* 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
|
6053 indicate no change is to take place. |
314 | 6054 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6055 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
|
6056 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
|
6057 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
|
6058 from a signal handler. |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6059 |
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6060 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
|
6061 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
|
6062 |
21514 | 6063 void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6064 change_frame_size (f, newheight, newwidth, pretend, delay, safe) |
25012 | 6065 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6066 int newheight, newwidth, pretend, delay, safe; |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6067 { |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6068 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
|
6069 |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6070 if (FRAME_MSDOS_P (f)) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6071 { |
53229
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6072 /* On MS-DOS, all frames use the same screen, so a change in |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6073 size affects all frames. Termcap now supports multiple |
33c3c7c16e13
lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents:
53226
diff
changeset
|
6074 ttys. */ |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6075 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
|
6076 if (! FRAME_WINDOW_P (XFRAME (frame))) |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6077 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
|
6078 pretend, delay, safe); |
10770
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6079 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6080 else |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6081 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
|
6082 } |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6083 |
79745e047484
(change_frame_size_1): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
10745
diff
changeset
|
6084 static void |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6085 change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) |
25012 | 6086 register struct frame *f; |
25345
ca828f89fd6e
(do_pending_window_change): Add parameter `safe'.
Gerd Moellmann <gerd@gnu.org>
parents:
25318
diff
changeset
|
6087 int newheight, newwidth, pretend, delay, safe; |
314 | 6088 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6089 int new_frame_total_cols; |
46293
1fb8f75062c6
Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents:
44890
diff
changeset
|
6090 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
|
6091 |
314 | 6092 /* 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
|
6093 if (delay || (redisplaying_p && !safe)) |
314 | 6094 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6095 f->new_text_lines = newheight; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6096 f->new_text_cols = newwidth; |
314 | 6097 delayed_size_change = 1; |
6098 return; | |
6099 } | |
6100 | |
764 | 6101 /* 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
|
6102 f->new_text_lines = 0; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6103 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
|
6104 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
6105 /* 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
|
6106 if (newheight == 0) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6107 newheight = FRAME_LINES (f); |
15896
3a3c30116313
(change_frame_size_1): Clean up conditional.
Erik Naggum <erik@naggum.no>
parents:
15687
diff
changeset
|
6108 if (newwidth == 0) |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6109 newwidth = FRAME_COLS (f); |
25012 | 6110 |
6111 /* Compute width of windows in F. | |
6112 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
|
6113 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
|
6114 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6115 /* Round up to the smallest acceptable size. */ |
25012 | 6116 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
|
6117 |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
6118 /* 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
|
6119 if (newheight == FRAME_LINES (f) |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6120 && new_frame_total_cols == FRAME_TOTAL_COLS (f)) |
314 | 6121 return; |
6122 | |
15078 | 6123 BLOCK_INPUT; |
6124 | |
14286
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6125 #ifdef MSDOS |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6126 /* 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
|
6127 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
|
6128 or equal to the requested dimensions. */ |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6129 dos_set_window_size (&newheight, &newwidth); |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6130 #endif |
5d42664b4e74
(change_frame_size_1) [MSDOS]: Support frame size
Karl Heuer <kwzh@gnu.org>
parents:
14186
diff
changeset
|
6131 |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6132 if (newheight != FRAME_LINES (f)) |
314 | 6133 { |
25012 | 6134 if (FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f)) |
314 | 6135 { |
25012 | 6136 /* 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
|
6137 XSETFASTINT (XWINDOW (FRAME_ROOT_WINDOW (f))->top_line, |
25012 | 6138 FRAME_TOP_MARGIN (f)); |
6139 set_window_height (FRAME_ROOT_WINDOW (f), | |
6140 (newheight | |
6141 - 1 | |
6142 - FRAME_TOP_MARGIN (f)), | |
6143 0); | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6144 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
|
6145 newheight - 1); |
25012 | 6146 set_window_height (FRAME_MINIBUF_WINDOW (f), 1, 0); |
314 | 6147 } |
6148 else | |
764 | 6149 /* Frame has just one top-level window. */ |
25012 | 6150 set_window_height (FRAME_ROOT_WINDOW (f), |
6151 newheight - FRAME_TOP_MARGIN (f), 0); | |
6152 | |
6153 if (FRAME_TERMCAP_P (f) && !pretend) | |
53232
22aaf1e5fbe6
Full support for multiple terminal I/O (with some rough edges).
Karoly Lorentey <lorentey@elte.hu>
parents:
53231
diff
changeset
|
6154 FrameRows (FRAME_TTY (f)) = newheight; |
314 | 6155 } |
6156 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6157 if (new_frame_total_cols != FRAME_TOTAL_COLS (f)) |
314 | 6158 { |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6159 set_window_width (FRAME_ROOT_WINDOW (f), new_frame_total_cols, 0); |
25012 | 6160 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
|
6161 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0); |
25012 | 6162 |
6163 if (FRAME_TERMCAP_P (f) && !pretend) | |
53232
22aaf1e5fbe6
Full support for multiple terminal I/O (with some rough edges).
Karoly Lorentey <lorentey@elte.hu>
parents:
53231
diff
changeset
|
6164 FrameCols (FRAME_TTY (f)) = newwidth; |
25012 | 6165 |
25544
693ca9ba497a
Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents:
25514
diff
changeset
|
6166 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
|
6167 XSETFASTINT (XWINDOW (f->tool_bar_window)->total_cols, newwidth); |
314 | 6168 } |
6169 | |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6170 FRAME_LINES (f) = newheight; |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6171 SET_FRAME_COLS (f, newwidth); |
25012 | 6172 |
6173 { | |
6174 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); | |
6175 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
|
6176 |
25012 | 6177 window_box (w, TEXT_AREA, &text_area_x, &text_area_y, &text_area_width, |
6178 &text_area_height); | |
6179 if (w->cursor.x >= text_area_x + text_area_width) | |
6180 w->cursor.hpos = w->cursor.x = 0; | |
6181 if (w->cursor.y >= text_area_y + text_area_height) | |
6182 w->cursor.vpos = w->cursor.y = 0; | |
6183 } | |
6184 | |
6185 adjust_glyphs (f); | |
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6186 calculate_costs (f); |
25012 | 6187 SET_FRAME_GARBAGED (f); |
40512
d256f6fc9c05
(change_frame_size_1): Set frame's resized_p.
Gerd Moellmann <gerd@gnu.org>
parents:
40334
diff
changeset
|
6188 f->resized_p = 1; |
15065 | 6189 |
6190 UNBLOCK_INPUT; | |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
6191 |
19627
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6192 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
|
6193 |
17282
5023bea28298
(change_frame_size_1): Call Fset_window_buffer,
Richard M. Stallman <rms@gnu.org>
parents:
17015
diff
changeset
|
6194 /* This isn't quite a no-op: it runs window-configuration-change-hook. */ |
25012 | 6195 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
|
6196 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
|
6197 |
c6343f7a9c6c
(change_frame_size_1): Save current buffer
Richard M. Stallman <rms@gnu.org>
parents:
19063
diff
changeset
|
6198 unbind_to (count, Qnil); |
314 | 6199 } |
25012 | 6200 |
6201 | |
314 | 6202 |
25012 | 6203 /*********************************************************************** |
6204 Terminal Related Lisp Functions | |
6205 ***********************************************************************/ | |
6206 | |
6207 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript, | |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6208 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
|
6209 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
|
6210 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
|
6211 (file) |
25012 | 6212 Lisp_Object file; |
6213 { | |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6214 if (TTY_TERMSCRIPT (CURTTY ()) != 0) |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6215 fclose (TTY_TERMSCRIPT (CURTTY ())); |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6216 TTY_TERMSCRIPT (CURTTY ()) = 0; |
25012 | 6217 |
6218 if (! NILP (file)) | |
6219 { | |
6220 file = Fexpand_file_name (file, Qnil); | |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6221 TTY_TERMSCRIPT (CURTTY ()) = fopen (SDATA (file), "w"); |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6222 if (TTY_TERMSCRIPT (CURTTY ()) == 0) |
25012 | 6223 report_file_error ("Opening termscript", Fcons (file, Qnil)); |
6224 } | |
6225 return Qnil; | |
6226 } | |
6227 | |
6228 | |
314 | 6229 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
|
6230 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
|
6231 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
|
6232 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
|
6233 (string) |
14068
a3c83dde295e
(Fsend_string_to_terminal, Fsit_for): Harmonize arguments with
Erik Naggum <erik@naggum.no>
parents:
13526
diff
changeset
|
6234 Lisp_Object string; |
314 | 6235 { |
20618
d5acac3af6e3
(Fsend_string_to_terminal): Use size_byte.
Richard M. Stallman <rms@gnu.org>
parents:
19627
diff
changeset
|
6236 /* ??? 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
|
6237 CHECK_STRING (string); |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
6238 if (! FRAME_TERMCAP_P (SELECTED_FRAME ())) |
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
6239 error ("Current frame is not on a tty device"); |
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
6240 |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6241 if (TTY_TERMSCRIPT (CURTTY ())) |
314 | 6242 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
46293
diff
changeset
|
6243 fwrite (SDATA (string), 1, SBYTES (string), |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6244 TTY_TERMSCRIPT (CURTTY ())); |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6245 fflush (TTY_TERMSCRIPT (CURTTY ())); |
314 | 6246 } |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6247 fwrite (SDATA (string), 1, SBYTES (string), |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6248 TTY_OUTPUT (CURTTY ())); |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6249 fflush (TTY_OUTPUT (CURTTY ())); |
314 | 6250 return Qnil; |
6251 } | |
6252 | |
25012 | 6253 |
314 | 6254 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
|
6255 doc: /* Beep, or flash the screen. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6256 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
|
6257 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
|
6258 (arg) |
314 | 6259 Lisp_Object arg; |
6260 { | |
493 | 6261 if (!NILP (arg)) |
314 | 6262 { |
649
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6263 if (noninteractive) |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6264 putchar (07); |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6265 else |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
6266 ring_bell (); |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
6267 if (FRAME_TERMCAP_P (XFRAME (selected_frame))) |
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
6268 fflush (TTY_OUTPUT (CURTTY ())); |
314 | 6269 } |
6270 else | |
6271 bitch_at_user (); | |
6272 | |
6273 return Qnil; | |
6274 } | |
6275 | |
21514 | 6276 void |
314 | 6277 bitch_at_user () |
6278 { | |
6279 if (noninteractive) | |
6280 putchar (07); | |
25012 | 6281 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ |
314 | 6282 error ("Keyboard macro terminated by a command ringing the bell"); |
6283 else | |
6284 ring_bell (); | |
82990
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
6285 if (FRAME_TERMCAP_P (XFRAME (selected_frame))) |
2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents:
82989
diff
changeset
|
6286 fflush (TTY_OUTPUT (CURTTY ())); |
314 | 6287 } |
6288 | |
25012 | 6289 |
6290 | |
6291 /*********************************************************************** | |
6292 Sleeping, Waiting | |
6293 ***********************************************************************/ | |
6294 | |
314 | 6295 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
|
6296 doc: /* Pause, without updating display, for SECONDS seconds. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6297 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
|
6298 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
|
6299 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
|
6300 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
|
6301 \(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
|
6302 (seconds, milliseconds) |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6303 Lisp_Object seconds, milliseconds; |
314 | 6304 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6305 int sec, usec; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6306 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6307 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
|
6308 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
|
6309 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6310 CHECK_NUMBER (milliseconds); |
2648 | 6311 usec = XINT (milliseconds) * 1000; |
6312 | |
6313 { | |
6314 double duration = extract_float (seconds); | |
6315 sec = (int) duration; | |
6316 usec += (duration - sec) * 1000000; | |
6317 } | |
314 | 6318 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6319 #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
|
6320 if (sec == 0 && usec != 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6321 error ("millisecond `sleep-for' not supported on %s", SYSTEM_TYPE); |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6322 #endif |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6323 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6324 /* 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
|
6325 if (usec < 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6326 { |
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
|
6327 /* 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
|
6328 if (-1000000 < usec) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6329 sec--, usec += 1000000; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6330 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6331 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
|
6332 } |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6333 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6334 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
|
6335 |
14646
68fe10d1abd0
(Fsleep_for): Accept sub-second intervals.
Erik Naggum <erik@naggum.no>
parents:
14459
diff
changeset
|
6336 if (sec < 0 || (sec == 0 && usec == 0)) |
314 | 6337 return Qnil; |
6338 | |
650 | 6339 { |
6340 Lisp_Object zero; | |
6341 | |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
6342 XSETFASTINT (zero, 0); |
650 | 6343 wait_reading_process_input (sec, usec, zero, 0); |
6344 } | |
587 | 6345 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6346 /* We should always have wait_reading_process_input; we have a dummy |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6347 implementation for systems which don't support subprocesses. */ |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6348 #if 0 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6349 /* No wait_reading_process_input */ |
314 | 6350 immediate_quit = 1; |
6351 QUIT; | |
6352 | |
6353 #ifdef VMS | |
6354 sys_sleep (sec); | |
6355 #else /* not VMS */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6356 /* The reason this is done this way |
314 | 6357 (rather than defined (H_S) && defined (H_T)) |
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
|
6358 is because the VMS preprocessor doesn't grok `defined'. */ |
314 | 6359 #ifdef HAVE_SELECT |
554 | 6360 EMACS_GET_TIME (end_time); |
6361 EMACS_SET_SECS_USECS (timeout, sec, usec); | |
587 | 6362 EMACS_ADD_TIME (end_time, end_time, timeout); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6363 |
314 | 6364 while (1) |
6365 { | |
554 | 6366 EMACS_GET_TIME (timeout); |
6367 EMACS_SUB_TIME (timeout, end_time, timeout); | |
6368 if (EMACS_TIME_NEG_P (timeout) | |
6369 || !select (1, 0, 0, 0, &timeout)) | |
314 | 6370 break; |
6371 } | |
6372 #else /* not HAVE_SELECT */ | |
6373 sleep (sec); | |
6374 #endif /* HAVE_SELECT */ | |
6375 #endif /* not VMS */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6376 |
314 | 6377 immediate_quit = 0; |
6378 #endif /* no subprocesses */ | |
6379 | |
6380 return Qnil; | |
6381 } | |
6382 | |
25012 | 6383 |
650 | 6384 /* This is just like wait_reading_process_input, except that |
6385 it does the redisplay. | |
6386 | |
5223
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
6387 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
|
6388 waiting for input as well. */ |
650 | 6389 |
6390 Lisp_Object | |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6391 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
|
6392 int sec, usec, reading, display, initial_display; |
314 | 6393 { |
650 | 6394 Lisp_Object read_kbd; |
314 | 6395 |
14964
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6396 swallow_events (display); |
9938201005a3
(sit_for): Call swallow_events.
Richard M. Stallman <rms@gnu.org>
parents:
14903
diff
changeset
|
6397 |
43729
5b4c5b84bb9d
(sit_for): Don't wait if executing a kbd macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43713
diff
changeset
|
6398 if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_macro)) |
314 | 6399 return Qnil; |
650 | 6400 |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6401 if (initial_display) |
35336
002c02db42d3
Call redisplay_preserve_echo_area with additional arg.
Gerd Moellmann <gerd@gnu.org>
parents:
35307
diff
changeset
|
6402 redisplay_preserve_echo_area (2); |
314 | 6403 |
673 | 6404 if (sec == 0 && usec == 0) |
6405 return Qt; | |
6406 | |
314 | 6407 #ifdef SIGIO |
1915
98ecf99d7b1a
* dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
1872
diff
changeset
|
6408 gobble_input (0); |
650 | 6409 #endif |
6410 | |
9264
9338a124ea84
(redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents:
8903
diff
changeset
|
6411 XSETINT (read_kbd, reading ? -1 : 1); |
650 | 6412 wait_reading_process_input (sec, usec, read_kbd, display); |
6413 | |
314 | 6414 return detect_input_pending () ? Qnil : Qt; |
6415 } | |
6416 | |
25012 | 6417 |
650 | 6418 DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0, |
40979 | 6419 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
|
6420 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
|
6421 fraction of a second. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6422 \(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
|
6423 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
|
6424 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
|
6425 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
|
6426 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
|
6427 |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6428 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
|
6429 \(sit-for SECONDS &optional MILLISECONDS NODISP) |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6430 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
|
6431 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
|
6432 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
|
6433 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
|
6434 |
d40ff6314d84
(Fsit_for): Don't lie about the number of args.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51232
diff
changeset
|
6435 /* 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
|
6436 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
|
6437 (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
|
6438 Lisp_Object seconds, milliseconds, nodisp; |
650 | 6439 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6440 int sec, usec; |
650 | 6441 |
50589
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6442 if (NILP (nodisp) && !NUMBERP (milliseconds)) |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6443 { /* New style. */ |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6444 nodisp = milliseconds; |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6445 milliseconds = Qnil; |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6446 } |
cf8d9d62ba1e
(Fsit_For): Support XEmacs-style arg list.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50218
diff
changeset
|
6447 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6448 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
|
6449 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
|
6450 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6451 CHECK_NUMBER (milliseconds); |
2648 | 6452 usec = XINT (milliseconds) * 1000; |
6453 | |
6454 { | |
6455 double duration = extract_float (seconds); | |
6456 sec = (int) duration; | |
6457 usec += (duration - sec) * 1000000; | |
6458 } | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6459 |
650 | 6460 #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
|
6461 if (usec != 0 && sec == 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
6462 error ("millisecond `sit-for' not supported on %s", SYSTEM_TYPE); |
650 | 6463 #endif |
6464 | |
17961
86ae1679df19
(sit_for): New arg initial_display.
Richard M. Stallman <rms@gnu.org>
parents:
17895
diff
changeset
|
6465 return sit_for (sec, usec, 0, NILP (nodisp), NILP (nodisp)); |
650 | 6466 } |
25012 | 6467 |
6468 | |
314 | 6469 |
25012 | 6470 /*********************************************************************** |
6471 Other Lisp Functions | |
6472 ***********************************************************************/ | |
6473 | |
6474 /* A vector of size >= 2 * NFRAMES + 3 * NBUFFERS + 1, containing the | |
6475 session's frames, frame names, buffers, buffer-read-only flags, and | |
6476 buffer-modified-flags, and a trailing sentinel (so we don't need to | |
6477 add length checks). */ | |
6478 | |
6479 static Lisp_Object frame_and_buffer_state; | |
6480 | |
6481 | |
6482 DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p, | |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6483 Sframe_or_buffer_changed_p, 0, 0, 0, |
40979 | 6484 doc: /* Return non-nil if the frame and buffer state appears to have changed. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6485 The state variable is an internal vector containing all frames and buffers, |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6486 aside from buffers whose names start with space, |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6487 along with the buffers' read-only and modified flags, which allows a fast |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6488 check to see whether the menu bars might need to be recomputed. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6489 If this function returns non-nil, it updates the internal vector to reflect |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6490 the current state. */) |
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6491 () |
25012 | 6492 { |
6493 Lisp_Object tail, frame, buf; | |
6494 Lisp_Object *vecp; | |
6495 int n; | |
6496 | |
6497 vecp = XVECTOR (frame_and_buffer_state)->contents; | |
6498 FOR_EACH_FRAME (tail, frame) | |
6499 { | |
6500 if (!EQ (*vecp++, frame)) | |
6501 goto changed; | |
6502 if (!EQ (*vecp++, XFRAME (frame)->name)) | |
6503 goto changed; | |
6504 } | |
6505 /* Check that the buffer info matches. | |
6506 No need to test for the end of the vector | |
6507 because the last element of the vector is lambda | |
6508 and that will always cause a mismatch. */ | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6509 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6510 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6511 buf = XCDR (XCAR (tail)); |
25012 | 6512 /* 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
|
6513 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
25012 | 6514 continue; |
6515 if (!EQ (*vecp++, buf)) | |
6516 goto changed; | |
6517 if (!EQ (*vecp++, XBUFFER (buf)->read_only)) | |
6518 goto changed; | |
6519 if (!EQ (*vecp++, Fbuffer_modified_p (buf))) | |
6520 goto changed; | |
6521 } | |
6522 /* Detect deletion of a buffer at the end of the list. */ | |
6523 if (EQ (*vecp, Qlambda)) | |
6524 return Qnil; | |
6525 changed: | |
6526 /* Start with 1 so there is room for at least one lambda at the end. */ | |
6527 n = 1; | |
6528 FOR_EACH_FRAME (tail, frame) | |
6529 n += 2; | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6530 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6531 n += 3; |
6532 /* Reallocate the vector if it's grown, or if it's shrunk a lot. */ | |
6533 if (n > XVECTOR (frame_and_buffer_state)->size | |
6534 || n + 20 < XVECTOR (frame_and_buffer_state)->size / 2) | |
6535 /* Add 20 extra so we grow it less often. */ | |
6536 frame_and_buffer_state = Fmake_vector (make_number (n + 20), Qlambda); | |
6537 vecp = XVECTOR (frame_and_buffer_state)->contents; | |
6538 FOR_EACH_FRAME (tail, frame) | |
6539 { | |
6540 *vecp++ = frame; | |
6541 *vecp++ = XFRAME (frame)->name; | |
6542 } | |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6543 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail)) |
25012 | 6544 { |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
26088
diff
changeset
|
6545 buf = XCDR (XCAR (tail)); |
25012 | 6546 /* 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
|
6547 if (SREF (XBUFFER (buf)->name, 0) == ' ') |
25012 | 6548 continue; |
6549 *vecp++ = buf; | |
6550 *vecp++ = XBUFFER (buf)->read_only; | |
6551 *vecp++ = Fbuffer_modified_p (buf); | |
6552 } | |
6553 /* Fill up the vector with lambdas (always at least one). */ | |
6554 *vecp++ = Qlambda; | |
6555 while (vecp - XVECTOR (frame_and_buffer_state)->contents | |
6556 < XVECTOR (frame_and_buffer_state)->size) | |
6557 *vecp++ = Qlambda; | |
6558 /* Make sure we didn't overflow the vector. */ | |
6559 if (vecp - XVECTOR (frame_and_buffer_state)->contents | |
6560 > XVECTOR (frame_and_buffer_state)->size) | |
6561 abort (); | |
6562 return Qt; | |
6563 } | |
6564 | |
6565 | |
6566 | |
6567 /*********************************************************************** | |
6568 Initialization | |
6569 ***********************************************************************/ | |
6570 | |
6571 /* Initialization done when Emacs fork is started, before doing stty. | |
6572 Determine terminal type and set terminal_driver. Then invoke its | |
6573 decoding routine to set up variables in the terminal package. */ | |
314 | 6574 |
21514 | 6575 void |
314 | 6576 init_display () |
6577 { | |
53226
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6578 char *terminal_type; |
dd3018b4785b
Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents:
53225
diff
changeset
|
6579 |
314 | 6580 #ifdef HAVE_X_WINDOWS |
6581 extern int display_arg; | |
6582 #endif | |
6583 | |
25012 | 6584 /* Construct the space glyph. */ |
6585 space_glyph.type = CHAR_GLYPH; | |
6586 SET_CHAR_GLYPH_FROM_GLYPH (space_glyph, ' '); | |
6587 space_glyph.charpos = -1; | |
6588 | |
314 | 6589 inverse_video = 0; |
6590 cursor_in_echo_area = 0; | |
6591 terminal_type = (char *) 0; | |
6592 | |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6593 /* 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
|
6594 during startup. */ |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6595 Vinitial_window_system = Qnil; |
314 | 6596 |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6597 /* 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
|
6598 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
|
6599 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
|
6600 using the window system. |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
6601 |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6602 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
|
6603 try to use X, and die with an error message if that doesn't work. */ |
314 | 6604 |
6605 #ifdef HAVE_X_WINDOWS | |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6606 if (! display_arg) |
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6607 { |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6608 char *display; |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6609 #ifdef VMS |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6610 display = getenv ("DECW$DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6611 #else |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6612 display = getenv ("DISPLAY"); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6613 #endif |
14125
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6614 |
2f222e8b06f5
(init_display): Treat null string DISPLAY var like not set.
Karl Heuer <kwzh@gnu.org>
parents:
14068
diff
changeset
|
6615 display_arg = (display != 0 && *display != 0); |
2364 | 6616 } |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
6617 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6618 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
|
6619 #ifndef CANNOT_DUMP |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6620 && initialized |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6621 #endif |
95b4ac950a5d
(init_display): Go ahead and prepare for
Richard M. Stallman <rms@gnu.org>
parents:
18015
diff
changeset
|
6622 ) |
314 | 6623 { |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6624 Vinitial_window_system = intern ("x"); |
314 | 6625 #ifdef HAVE_X11 |
6626 Vwindow_system_version = make_number (11); | |
6627 #else | |
6628 Vwindow_system_version = make_number (10); | |
6629 #endif | |
41969
e669966d496e
Test GNU_LINUX, not LINUX.
Richard M. Stallman <rms@gnu.org>
parents:
41120
diff
changeset
|
6630 #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
|
6631 /* In some versions of ncurses, |
15282 | 6632 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
|
6633 So call tgetent. */ |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6634 { char b[2044]; tgetent (b, "xterm");} |
db889dd732a1
(init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
Karl Heuer <kwzh@gnu.org>
parents:
15078
diff
changeset
|
6635 #endif |
25012 | 6636 adjust_frame_glyphs_initially (); |
314 | 6637 return; |
6638 } | |
6639 #endif /* HAVE_X_WINDOWS */ | |
6640 | |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6641 #ifdef HAVE_NTGUI |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6642 if (!inhibit_window_system) |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6643 { |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6644 Vinitial_window_system = intern ("w32"); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6645 Vwindow_system_version = make_number (1); |
25012 | 6646 adjust_frame_glyphs_initially (); |
13408
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6647 return; |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6648 } |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6649 #endif /* HAVE_NTGUI */ |
7e92386e1cf7
[HAVE_NTGUI]: Include w32term.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
13220
diff
changeset
|
6650 |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6651 #ifdef MAC_OS |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6652 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
|
6653 { |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6654 Vinitial_window_system = intern ("mac"); |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6655 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
|
6656 adjust_frame_glyphs_initially (); |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6657 return; |
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6658 } |
44890
01b93e5e53a7
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
Andrew Choi <akochoi@shaw.ca>
parents:
44815
diff
changeset
|
6659 #endif /* MAC_OS */ |
32752
923b8d6d8277
Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents:
32468
diff
changeset
|
6660 |
314 | 6661 /* If no window system has been specified, try to use the terminal. */ |
6662 if (! isatty (0)) | |
6663 { | |
16896
b2c51d6de440
(init_display): Use `fatal'.
Richard M. Stallman <rms@gnu.org>
parents:
16891
diff
changeset
|
6664 fatal ("standard input is not a tty"); |
314 | 6665 exit (1); |
6666 } | |
6667 | |
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
|
6668 /* Look at the TERM variable. */ |
314 | 6669 terminal_type = (char *) getenv ("TERM"); |
6670 if (!terminal_type) | |
6671 { | |
6672 #ifdef VMS | |
6673 fprintf (stderr, "Please specify your terminal type.\n\ | |
6674 For types defined in VMS, use set term /device=TYPE.\n\ | |
6675 For types not defined in VMS, use define emacs_term \"TYPE\".\n\ | |
6676 \(The quotation marks are necessary since terminal types are lower case.)\n"); | |
6677 #else | |
6678 fprintf (stderr, "Please set the environment variable TERM; see tset(1).\n"); | |
6679 #endif | |
6680 exit (1); | |
6681 } | |
6682 | |
6683 #ifdef VMS | |
25012 | 6684 /* VMS DCL tends to up-case things, so down-case term type. |
314 | 6685 Hardly any uppercase letters in terminal types; should be none. */ |
6686 { | |
6687 char *new = (char *) xmalloc (strlen (terminal_type) + 1); | |
6688 char *p; | |
6689 | |
6690 strcpy (new, terminal_type); | |
6691 | |
6692 for (p = new; *p; p++) | |
6693 if (isupper (*p)) | |
6694 *p = tolower (*p); | |
6695 | |
6696 terminal_type = new; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6697 } |
25012 | 6698 #endif /* VMS */ |
314 | 6699 |
53341 | 6700 { |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
6701 struct display *d; |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6702 struct frame *f = XFRAME (selected_frame); |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6703 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6704 /* Open a display on the controlling tty. */ |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6705 d = term_init (0, terminal_type, 1); /* Errors are fatal. */ |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6706 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6707 /* Convert the initial frame to use the new display. */ |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6708 if (! f->output_method == output_initial) |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6709 abort (); |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6710 f->output_method = d->type; |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6711 f->display = d; |
83023
6ce586a7243e
Set the keyboard of the initial frame correctly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83019
diff
changeset
|
6712 #ifdef MULTI_KBOARD |
6ce586a7243e
Set the keyboard of the initial frame correctly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83019
diff
changeset
|
6713 f->kboard = d->display_info.tty->kboard; |
6ce586a7243e
Set the keyboard of the initial frame correctly.
Karoly Lorentey <lorentey@elte.hu>
parents:
83019
diff
changeset
|
6714 #endif |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6715 |
83009
b2b37c85b00a
Numerous bugfixes and small improvements.
Karoly Lorentey <lorentey@elte.hu>
parents:
83008
diff
changeset
|
6716 d->reference_count++; |
83004
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
6717 d->display_info.tty->top_frame = selected_frame; |
7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
82995
diff
changeset
|
6718 change_frame_size (XFRAME (selected_frame), FrameRows (d->display_info.tty), FrameCols (d->display_info.tty), 0, 0, 1); |
83008
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6719 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6720 /* Delete the initial display. */ |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6721 if (--initial_display->reference_count == 0 |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6722 && initial_display->delete_display_hook) |
040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents:
83004
diff
changeset
|
6723 (*initial_display->delete_display_hook) (initial_display); |
53341 | 6724 } |
6725 | |
16891
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6726 { |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6727 struct frame *sf = SELECTED_FRAME (); |
51193
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6728 int width = FRAME_TOTAL_COLS (sf); |
d47b56221a15
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50589
diff
changeset
|
6729 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
|
6730 |
25012 | 6731 unsigned int total_glyphs = height * (width + 2) * sizeof (struct glyph); |
6732 | |
6733 /* If these sizes are so big they cause overflow, just ignore the | |
6734 change. It's not clear what better we could do. */ | |
6735 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
|
6736 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
|
6737 } |
989845750a4d
(init_display): Check for overflow in screen size.
Richard M. Stallman <rms@gnu.org>
parents:
16881
diff
changeset
|
6738 |
25012 | 6739 adjust_frame_glyphs_initially (); |
25666
063da8f6a487
(selected_frame): Make it a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents:
25546
diff
changeset
|
6740 calculate_costs (XFRAME (selected_frame)); |
314 | 6741 |
6742 #ifdef SIGWINCH | |
6743 #ifndef CANNOT_DUMP | |
6744 if (initialized) | |
6745 #endif /* CANNOT_DUMP */ | |
6746 signal (SIGWINCH, window_change_signal); | |
6747 #endif /* SIGWINCH */ | |
25012 | 6748 |
6749 /* Set up faces of the initial terminal frame of a dumped Emacs. */ | |
6750 if (initialized | |
6751 && !noninteractive | |
25118
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6752 #ifdef MSDOS |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6753 /* 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
|
6754 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
|
6755 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
|
6756 and internal_terminal_init. */ |
08ae9ffe6763
(init_display) [MSDOS]: Don't initialize frame faces,
Eli Zaretskii <eliz@gnu.org>
parents:
25012
diff
changeset
|
6757 && (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
|
6758 #endif |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6759 && NILP (Vinitial_window_system)) |
26729
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6760 { |
f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents:
26591
diff
changeset
|
6761 /* 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
|
6762 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
|
6763 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
|
6764 |
26902
264b83a3a688
Changes for separate unspecified foreground and background colors
Eli Zaretskii <eliz@gnu.org>
parents:
26851
diff
changeset
|
6765 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
|
6766 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
|
6767 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
|
6768 } |
314 | 6769 } |
25012 | 6770 |
6771 | |
314 | 6772 |
25012 | 6773 /*********************************************************************** |
6774 Blinking cursor | |
6775 ***********************************************************************/ | |
6776 | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6777 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
|
6778 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
|
6779 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
|
6780 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
|
6781 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
|
6782 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
|
6783 (window, show) |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6784 Lisp_Object window, show; |
25012 | 6785 { |
6786 /* Don't change cursor state while redisplaying. This could confuse | |
6787 output routines. */ | |
6788 if (!redisplaying_p) | |
6789 { | |
6790 if (NILP (window)) | |
6791 window = selected_window; | |
6792 else | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6793 CHECK_WINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6794 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6795 XWINDOW (window)->cursor_off_p = NILP (show); |
25012 | 6796 } |
6797 | |
6798 return Qnil; | |
6799 } | |
6800 | |
6801 | |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6802 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
|
6803 Sinternal_show_cursor_p, 0, 1, 0, |
40979 | 6804 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
|
6805 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
|
6806 (window) |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6807 Lisp_Object window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6808 { |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6809 struct window *w; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6810 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6811 if (NILP (window)) |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6812 window = selected_window; |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6813 else |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40512
diff
changeset
|
6814 CHECK_WINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6815 |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6816 w = XWINDOW (window); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6817 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
|
6818 } |
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6819 |
25012 | 6820 |
6821 /*********************************************************************** | |
6822 Initialization | |
6823 ***********************************************************************/ | |
6824 | |
21514 | 6825 void |
314 | 6826 syms_of_display () |
6827 { | |
764 | 6828 defsubr (&Sredraw_frame); |
314 | 6829 defsubr (&Sredraw_display); |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6830 defsubr (&Sframe_or_buffer_changed_p); |
314 | 6831 defsubr (&Sopen_termscript); |
6832 defsubr (&Sding); | |
6833 defsubr (&Ssit_for); | |
6834 defsubr (&Ssleep_for); | |
6835 defsubr (&Ssend_string_to_terminal); | |
26280
083835afced5
(Finternal_show_cursor): Renamed from Fshow_cursor.
Gerd Moellmann <gerd@gnu.org>
parents:
26164
diff
changeset
|
6836 defsubr (&Sinternal_show_cursor); |
26334
e3a9ceb7a557
(Finternal_show_cursor): Change it to set the
Gerd Moellmann <gerd@gnu.org>
parents:
26280
diff
changeset
|
6837 defsubr (&Sinternal_show_cursor_p); |
314 | 6838 |
34893
779bd3fa820e
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents:
34866
diff
changeset
|
6839 #if GLYPH_DEBUG |
34866
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6840 defsubr (&Sdump_redisplay_history); |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6841 #endif |
4f47fc699608
(struct redisplay_history) [GLYPH_DEBUG]: New.
Gerd Moellmann <gerd@gnu.org>
parents:
34849
diff
changeset
|
6842 |
12186
6811992e871c
(Fframe_or_buffer_changed_p): Calculate vector size right.
Karl Heuer <kwzh@gnu.org>
parents:
11919
diff
changeset
|
6843 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
|
6844 staticpro (&frame_and_buffer_state); |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
6845 |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6846 Qdisplay_table = intern ("display-table"); |
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6847 staticpro (&Qdisplay_table); |
30720
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6848 Qredisplay_dont_pause = intern ("redisplay-dont-pause"); |
64f3338f72d8
(Qredisplay_dont_pause): New variable.
Gerd Moellmann <gerd@gnu.org>
parents:
30713
diff
changeset
|
6849 staticpro (&Qredisplay_dont_pause); |
13220
2e9014617492
(Qdisplay_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
13105
diff
changeset
|
6850 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6851 DEFVAR_INT ("baud-rate", &baud_rate, |
40979 | 6852 doc: /* *The output baud rate of the terminal. |
39914
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6853 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
|
6854 and the other strategic decisions made during redisplay. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6855 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6856 DEFVAR_BOOL ("inverse-video", &inverse_video, |
40979 | 6857 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
|
6858 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
|
6859 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6860 DEFVAR_BOOL ("visible-bell", &visible_bell, |
40979 | 6861 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
|
6862 |
bee6cc2e8a90
(syms_of_display) <visible-bell>: Add a reference to
Eli Zaretskii <eliz@gnu.org>
parents:
40271
diff
changeset
|
6863 See also `ring-bell-function'. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6864 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6865 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, |
40979 | 6866 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
|
6867 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
|
6868 Emacs's frame display when you reenter Emacs. |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6869 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
|
6870 |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6871 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system, |
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6872 doc: /* Name of the window system that Emacs uses for the first frame. |
41025
4feeae90afa4
(syms_of_display): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40979
diff
changeset
|
6873 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
|
6874 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
|
6875 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6876 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, |
40979 | 6877 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
|
6878 For X windows, this is 10 or 11. */); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49322
diff
changeset
|
6879 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6880 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, |
40979 | 6881 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
|
6882 |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6883 DEFVAR_LISP ("glyph-table", &Vglyph_table, |
40979 | 6884 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
|
6885 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
|
6886 Each element can be: |
91951fb5b9e5
Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents:
39682
diff
changeset
|
6887 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
|
6888 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
|
6889 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
|
6890 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
|
6891 while outputting it. */); |
314 | 6892 Vglyph_table = Qnil; |
6893 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6894 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table, |
40979 | 6895 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
|
6896 See `buffer-display-table' for more information. */); |
314 | 6897 Vstandard_display_table = Qnil; |
6898 | |
39988
eac4e9ae201c
Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents:
39954
diff
changeset
|
6899 DEFVAR_BOOL ("redisplay-dont-pause", &redisplay_dont_pause, |
40979 | 6900 doc: /* *Non-nil means update isn't paused when input is detected. */); |
25012 | 6901 redisplay_dont_pause = 0; |
6902 | |
314 | 6903 /* Initialize `window-system', unless init_display already decided it. */ |
6904 #ifdef CANNOT_DUMP | |
6905 if (noninteractive) | |
6906 #endif | |
6907 { | |
83014
f5cadabb36dd
Support for opening X frames from a tty session.
Karoly Lorentey <lorentey@elte.hu>
parents:
83010
diff
changeset
|
6908 Vinitial_window_system = Qnil; |
314 | 6909 Vwindow_system_version = Qnil; |
6910 } | |
6911 } | |
52401 | 6912 |
6913 /* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413 | |
6914 (do not change this comment) */ |