Mercurial > emacs
annotate src/dispnew.c @ 10304:ce5ab980a14f
Use SAVE_MODIFF and BUF_SAVE_MODIFF
instead of direct access to the save_modiff field.
(Finsert_file_contents, Fwrite_region): Error if buffer is indirect.
(Fdo_auto_save): Do nothing for an indirect buffer.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 02 Jan 1995 06:36:56 +0000 |
parents | 48e4dfc6bb43 |
children | a553a08f5785 |
rev | line source |
---|---|
314 | 1 /* Updating of data structures for redisplay. |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
2 Copyright (C) 1985, 86, 87, 88, 93, 94 Free Software Foundation, Inc. |
314 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 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
|
8 the Free Software Foundation; either version 2, or (at your option) |
314 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |
19 | |
20 | |
21 #include <signal.h> | |
22 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4551
diff
changeset
|
23 #include <config.h> |
7900
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7814
diff
changeset
|
24 |
60795e826dad
Put stdio.h after config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7814
diff
changeset
|
25 #include <stdio.h> |
314 | 26 #include <ctype.h> |
27 | |
3525
58e789baa27a
Include lisp.h earlier (before termhooks.h).
Richard M. Stallman <rms@gnu.org>
parents:
3517
diff
changeset
|
28 #include "lisp.h" |
314 | 29 #include "termchar.h" |
30 #include "termopts.h" | |
2198 | 31 #include "termhooks.h" |
314 | 32 #include "cm.h" |
33 #include "dispextern.h" | |
34 #include "buffer.h" | |
764 | 35 #include "frame.h" |
314 | 36 #include "window.h" |
37 #include "commands.h" | |
38 #include "disptab.h" | |
39 #include "indent.h" | |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
40 #include "intervals.h" |
314 | 41 |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
42 #include "systty.h" |
554 | 43 |
314 | 44 #ifdef HAVE_X_WINDOWS |
45 #include "xterm.h" | |
46 #endif /* HAVE_X_WINDOWS */ | |
47 | |
7808
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
48 /* Include systime.h after xterm.h to avoid double inclusion of time.h. */ |
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
49 #include "systime.h" |
52e2eb6245d4
Include systime.h after xterm.h.
Richard M. Stallman <rms@gnu.org>
parents:
7648
diff
changeset
|
50 |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
51 #include <errno.h> |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
52 |
314 | 53 #define max(a, b) ((a) > (b) ? (a) : (b)) |
54 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
55 | |
56 /* Get number of chars of output now in the buffer of a stdio stream. | |
57 This ought to be built in in stdio, but it isn't. | |
58 Some s- files override this because their stdio internals differ. */ | |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
59 #ifdef __GNU_LIBRARY__ |
7444 | 60 /* The s- file might have overridden the definition with one that works for |
61 the system's C library. But we are using the GNU C library, so this is | |
62 the right definition for every system. */ | |
7558
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
63 #ifdef GNU_LIBRARY_PENDING_OUTPUT_COUNT |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
64 #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
|
65 #else |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
66 #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
|
67 #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
|
68 #endif |
8497bcb9fb8e
(PENDING_OUTPUT_COUNT): If __GNU_LIBRARY__,
Richard M. Stallman <rms@gnu.org>
parents:
7530
diff
changeset
|
69 #else /* not __GNU_LIBRARY__ */ |
7443
a9cb818e5316
[__GNU_LIBRARY__]: Redefine PENDING_OUTPUT_COUNT even if already defined.
Roland McGrath <roland@gnu.org>
parents:
7247
diff
changeset
|
70 #ifndef PENDING_OUTPUT_COUNT |
314 | 71 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base) |
72 #endif | |
5214
c4bf07b226be
(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU
Roland McGrath <roland@gnu.org>
parents:
5083
diff
changeset
|
73 #endif |
314 | 74 |
554 | 75 /* Nonzero upon entry to redisplay means do not assume anything about |
764 | 76 current contents of actual terminal frame; clear and redraw it. */ |
314 | 77 |
764 | 78 int frame_garbaged; |
314 | 79 |
80 /* Nonzero means last display completed. Zero means it was preempted. */ | |
81 | |
82 int display_completed; | |
83 | |
84 /* Lisp variable visible-bell; enables use of screen-flash | |
85 instead of audible bell. */ | |
86 | |
87 int visible_bell; | |
88 | |
764 | 89 /* Invert the color of the whole frame, at a low level. */ |
314 | 90 |
91 int inverse_video; | |
92 | |
93 /* Line speed of the terminal. */ | |
94 | |
95 int baud_rate; | |
96 | |
97 /* nil or a symbol naming the window system under which emacs is | |
98 running ('x is the only current possibility). */ | |
99 | |
100 Lisp_Object Vwindow_system; | |
101 | |
102 /* Version number of X windows: 10, 11 or nil. */ | |
103 Lisp_Object Vwindow_system_version; | |
104 | |
105 /* Vector of glyph definitions. Indexed by glyph number, | |
106 the contents are a string which is how to output the glyph. | |
107 | |
108 If Vglyph_table is nil, a glyph is output by using its low 8 bits | |
109 as a character code. */ | |
110 | |
111 Lisp_Object Vglyph_table; | |
112 | |
113 /* Display table to use for vectors that don't specify their own. */ | |
114 | |
115 Lisp_Object Vstandard_display_table; | |
116 | |
117 /* Nonzero means reading single-character input with prompt | |
708 | 118 so put cursor on minibuffer after the prompt. |
119 positive means at end of text in echo area; | |
120 negative means at beginning of line. */ | |
314 | 121 int cursor_in_echo_area; |
122 | |
764 | 123 /* The currently selected frame. |
9572 | 124 In a single-frame version, this variable always holds the address of |
125 the_only_frame. */ | |
314 | 126 |
764 | 127 FRAME_PTR selected_frame; |
314 | 128 |
764 | 129 /* A frame which is not just a minibuffer, or 0 if there are no such |
130 frames. This is usually the most recent such frame that was | |
9572 | 131 selected. In a single-frame version, this variable always holds |
132 the address of the_only_frame. */ | |
764 | 133 FRAME_PTR last_nonminibuf_frame; |
732 | 134 |
764 | 135 /* In a single-frame version, the information that would otherwise |
986
83605f96f58e
* dispnew.c (the_only_frame): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
960
diff
changeset
|
136 exist inside frame objects lives in the following structure instead. |
83605f96f58e
* dispnew.c (the_only_frame): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
960
diff
changeset
|
137 |
83605f96f58e
* dispnew.c (the_only_frame): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
960
diff
changeset
|
138 NOTE: the_only_frame is not checked for garbage collection; don't |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3525
diff
changeset
|
139 store collectible objects in any of its fields! |
986
83605f96f58e
* dispnew.c (the_only_frame): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
960
diff
changeset
|
140 |
83605f96f58e
* dispnew.c (the_only_frame): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
960
diff
changeset
|
141 You're not/The only frame in town/... */ |
314 | 142 |
764 | 143 #ifndef MULTI_FRAME |
144 struct frame the_only_frame; | |
732 | 145 #endif |
314 | 146 |
147 /* This is a vector, made larger whenever it isn't large enough, | |
764 | 148 which is used inside `update_frame' to hold the old contents |
149 of the FRAME_PHYS_LINES of the frame being updated. */ | |
150 struct frame_glyphs **ophys_lines; | |
314 | 151 /* Length of vector currently allocated. */ |
152 int ophys_lines_length; | |
153 | |
154 FILE *termscript; /* Stdio stream being used for copy of all output. */ | |
155 | |
156 struct cm Wcm; /* Structure for info on cursor positioning */ | |
157 | |
158 extern short ospeed; /* Output speed (from sg_ospeed) */ | |
159 | |
160 int delayed_size_change; /* 1 means SIGWINCH happened when not safe. */ | |
161 | |
764 | 162 #ifdef MULTI_FRAME |
314 | 163 |
764 | 164 DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0, |
165 "Clear frame FRAME and output again what is supposed to appear on it.") | |
166 (frame) | |
167 Lisp_Object frame; | |
314 | 168 { |
764 | 169 FRAME_PTR f; |
314 | 170 |
764 | 171 CHECK_LIVE_FRAME (frame, 0); |
172 f = XFRAME (frame); | |
173 update_begin (f); | |
314 | 174 /* set_terminal_modes (); */ |
764 | 175 clear_frame (); |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
176 clear_frame_records (f); |
764 | 177 update_end (f); |
314 | 178 fflush (stdout); |
179 windows_or_buffers_changed++; | |
180 /* Mark all windows as INaccurate, | |
181 so that every window will have its redisplay done. */ | |
764 | 182 mark_window_display_accurate (FRAME_ROOT_WINDOW (f), 0); |
183 f->garbaged = 0; | |
314 | 184 return Qnil; |
185 } | |
186 | |
764 | 187 redraw_frame (f) |
188 FRAME_PTR f; | |
314 | 189 { |
764 | 190 Lisp_Object frame; |
9264
9338a124ea84
(redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents:
8903
diff
changeset
|
191 XSETFRAME (frame, f); |
764 | 192 Fredraw_frame (frame); |
314 | 193 } |
194 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
195 #else |
314 | 196 |
6349
c88bce6b48f0
(Fredraw_frame) [! MULTI_FRAME]: Make noninteractive, to be consistent with
Karl Heuer <kwzh@gnu.org>
parents:
6069
diff
changeset
|
197 DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0, |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
198 "Clear frame FRAME and output again what is supposed to appear on it.") |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
199 (frame) |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
200 Lisp_Object frame; |
314 | 201 { |
202 update_begin (0); | |
203 set_terminal_modes (); | |
764 | 204 clear_frame (); |
314 | 205 update_end (0); |
206 fflush (stdout); | |
764 | 207 clear_frame_records (0); |
314 | 208 windows_or_buffers_changed++; |
209 /* Mark all windows as INaccurate, | |
210 so that every window will have its redisplay done. */ | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
211 mark_window_display_accurate (FRAME_ROOT_WINDOW (0), 0); |
314 | 212 return Qnil; |
213 } | |
214 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
215 #endif |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
216 |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
217 DEFUN ("redraw-display", Fredraw_display, Sredraw_display, 0, 0, "", |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
218 "Clear and redisplay all visible frames.") |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
219 () |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
220 { |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
221 Lisp_Object tail, frame; |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
222 |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
223 FOR_EACH_FRAME (tail, frame) |
3517
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
224 if (FRAME_VISIBLE_P (XFRAME (frame))) |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
225 Fredraw_frame (frame); |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
226 |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
227 return Qnil; |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
228 } |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
229 |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
230 /* This is used when frame_garbaged is set. |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
231 Redraw the individual frames marked as garbaged. */ |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
232 |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
233 void |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
234 redraw_garbaged_frames () |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
235 { |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
236 Lisp_Object tail, frame; |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
237 |
657a74662346
(Fredraw_display): Redraw all visible frames.
Richard M. Stallman <rms@gnu.org>
parents:
3449
diff
changeset
|
238 FOR_EACH_FRAME (tail, frame) |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
239 if (FRAME_VISIBLE_P (XFRAME (frame)) |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
240 && FRAME_GARBAGED_P (XFRAME (frame))) |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
241 Fredraw_frame (frame); |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
242 } |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
243 |
314 | 244 |
764 | 245 static struct frame_glyphs * |
246 make_frame_glyphs (frame, empty) | |
247 register FRAME_PTR frame; | |
314 | 248 int empty; |
249 { | |
250 register int i; | |
764 | 251 register width = FRAME_WIDTH (frame); |
252 register height = FRAME_HEIGHT (frame); | |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
253 register struct frame_glyphs *new |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
254 = (struct frame_glyphs *) xmalloc (sizeof (struct frame_glyphs)); |
314 | 255 |
764 | 256 SET_GLYPHS_FRAME (new, frame); |
314 | 257 new->height = height; |
258 new->width = width; | |
259 new->used = (int *) xmalloc (height * sizeof (int)); | |
260 new->glyphs = (GLYPH **) xmalloc (height * sizeof (GLYPH *)); | |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
261 new->charstarts = (int **) xmalloc (height * sizeof (int *)); |
314 | 262 new->highlight = (char *) xmalloc (height * sizeof (char)); |
263 new->enable = (char *) xmalloc (height * sizeof (char)); | |
264 bzero (new->enable, height * sizeof (char)); | |
265 new->bufp = (int *) xmalloc (height * sizeof (int)); | |
266 | |
267 #ifdef HAVE_X_WINDOWS | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
268 if (FRAME_X_P (frame)) |
314 | 269 { |
270 new->top_left_x = (short *) xmalloc (height * sizeof (short)); | |
271 new->top_left_y = (short *) xmalloc (height * sizeof (short)); | |
272 new->pix_width = (short *) xmalloc (height * sizeof (short)); | |
273 new->pix_height = (short *) xmalloc (height * sizeof (short)); | |
1407
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
274 new->max_ascent = (short *) xmalloc (height * sizeof (short)); |
314 | 275 } |
276 #endif | |
277 | |
278 if (empty) | |
279 { | |
280 /* Make the buffer used by decode_mode_spec. This buffer is also | |
764 | 281 used as temporary storage when updating the frame. See scroll.c. */ |
314 | 282 unsigned int total_glyphs = (width + 2) * sizeof (GLYPH); |
6627
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
283 unsigned int total_charstarts = (width + 2) * sizeof (int); |
314 | 284 |
285 new->total_contents = (GLYPH *) xmalloc (total_glyphs); | |
286 bzero (new->total_contents, total_glyphs); | |
6627
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
287 |
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
288 new->total_charstarts = (int *) xmalloc (total_charstarts); |
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
289 bzero (new->total_charstarts, total_glyphs); |
314 | 290 } |
291 else | |
292 { | |
293 unsigned int total_glyphs = height * (width + 2) * sizeof (GLYPH); | |
294 | |
295 new->total_contents = (GLYPH *) xmalloc (total_glyphs); | |
296 bzero (new->total_contents, total_glyphs); | |
297 for (i = 0; i < height; i++) | |
298 new->glyphs[i] = new->total_contents + i * (width + 2) + 1; | |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
299 |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
300 if (!FRAME_TERMCAP_P (frame)) |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
301 { |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
302 unsigned int total_charstarts = height * (width + 2) * sizeof (int); |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
303 |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
304 new->total_charstarts = (int *) xmalloc (total_charstarts); |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
305 bzero (new->total_charstarts, total_charstarts); |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
306 for (i = 0; i < height; i++) |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
307 new->charstarts[i] = new->total_charstarts + i * (width + 2) + 1; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
308 } |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
309 else |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
310 { |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
311 /* Without a window system, we don't really need charstarts. |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
312 So use a small amount of space to make enough data structure |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
313 to prevent crashes in display_text_line. */ |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
314 new->total_charstarts = (int *) xmalloc ((width + 2) * sizeof (int)); |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
315 for (i = 0; i < height; i++) |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
316 new->charstarts[i] = new->total_charstarts; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
317 } |
314 | 318 } |
319 | |
320 return new; | |
321 } | |
322 | |
8665
f06ea671bacb
(free_frame_glyphs): No longer static.
Richard M. Stallman <rms@gnu.org>
parents:
8395
diff
changeset
|
323 void |
764 | 324 free_frame_glyphs (frame, glyphs) |
325 FRAME_PTR frame; | |
326 struct frame_glyphs *glyphs; | |
314 | 327 { |
328 if (glyphs->total_contents) | |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
329 xfree (glyphs->total_contents); |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
330 if (glyphs->total_charstarts) |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
331 xfree (glyphs->total_charstarts); |
314 | 332 |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
333 xfree (glyphs->used); |
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
334 xfree (glyphs->glyphs); |
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
335 xfree (glyphs->highlight); |
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
336 xfree (glyphs->enable); |
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
337 xfree (glyphs->bufp); |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
338 if (glyphs->charstarts) |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
339 xfree (glyphs->charstarts); |
314 | 340 |
341 #ifdef HAVE_X_WINDOWS | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
342 if (FRAME_X_P (frame)) |
314 | 343 { |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
344 xfree (glyphs->top_left_x); |
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
345 xfree (glyphs->top_left_y); |
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
346 xfree (glyphs->pix_width); |
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
347 xfree (glyphs->pix_height); |
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
348 xfree (glyphs->max_ascent); |
314 | 349 } |
350 #endif | |
351 | |
2439
b6c62e4abf59
Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents:
2365
diff
changeset
|
352 xfree (glyphs); |
314 | 353 } |
354 | |
355 static void | |
764 | 356 remake_frame_glyphs (frame) |
357 FRAME_PTR frame; | |
314 | 358 { |
764 | 359 if (FRAME_CURRENT_GLYPHS (frame)) |
360 free_frame_glyphs (frame, FRAME_CURRENT_GLYPHS (frame)); | |
361 if (FRAME_DESIRED_GLYPHS (frame)) | |
362 free_frame_glyphs (frame, FRAME_DESIRED_GLYPHS (frame)); | |
363 if (FRAME_TEMP_GLYPHS (frame)) | |
364 free_frame_glyphs (frame, FRAME_TEMP_GLYPHS (frame)); | |
314 | 365 |
764 | 366 if (FRAME_MESSAGE_BUF (frame)) |
1872
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
367 { |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
368 /* Reallocate the frame's message buffer; remember that |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
369 echo_area_glyphs may be pointing here. */ |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
370 char *old_message_buf = FRAME_MESSAGE_BUF (frame); |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
371 |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
372 FRAME_MESSAGE_BUF (frame) |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
373 = (char *) xrealloc (FRAME_MESSAGE_BUF (frame), |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
374 FRAME_WIDTH (frame) + 1); |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
375 |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
376 if (echo_area_glyphs == old_message_buf) |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
377 echo_area_glyphs = FRAME_MESSAGE_BUF (frame); |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
378 if (previous_echo_glyphs == old_message_buf) |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
379 previous_echo_glyphs = FRAME_MESSAGE_BUF (frame); |
ad692b76edf4
* dispnew.c (remake_frame_glyphs): When re-allocating the frame's
Jim Blandy <jimb@redhat.com>
parents:
1849
diff
changeset
|
380 } |
314 | 381 else |
764 | 382 FRAME_MESSAGE_BUF (frame) |
383 = (char *) xmalloc (FRAME_WIDTH (frame) + 1); | |
314 | 384 |
764 | 385 FRAME_CURRENT_GLYPHS (frame) = make_frame_glyphs (frame, 0); |
386 FRAME_DESIRED_GLYPHS (frame) = make_frame_glyphs (frame, 0); | |
387 FRAME_TEMP_GLYPHS (frame) = make_frame_glyphs (frame, 1); | |
388 SET_FRAME_GARBAGED (frame); | |
314 | 389 } |
390 | |
764 | 391 /* Return the hash code of contents of line VPOS in frame-matrix M. */ |
314 | 392 |
393 static int | |
394 line_hash_code (m, vpos) | |
764 | 395 register struct frame_glyphs *m; |
314 | 396 int vpos; |
397 { | |
398 register GLYPH *body, *end; | |
399 register int h = 0; | |
400 | |
401 if (!m->enable[vpos]) | |
402 return 0; | |
403 | |
1495
f17665e7347e
(count_blanks): Leave argument r constant, and increment p.
Richard M. Stallman <rms@gnu.org>
parents:
1407
diff
changeset
|
404 /* Give all highlighted lines the same hash code |
314 | 405 so as to encourage scrolling to leave them in place. */ |
406 if (m->highlight[vpos]) | |
407 return -1; | |
408 | |
409 body = m->glyphs[vpos]; | |
410 | |
411 if (must_write_spaces) | |
412 while (1) | |
413 { | |
414 GLYPH g = *body++; | |
415 | |
416 if (g == 0) | |
417 break; | |
418 h = (((h << 4) + (h >> 24)) & 0x0fffffff) + g - SPACEGLYPH; | |
419 } | |
420 else | |
421 while (1) | |
422 { | |
423 GLYPH g = *body++; | |
424 | |
425 if (g == 0) | |
426 break; | |
427 h = (((h << 4) + (h >> 24)) & 0x0fffffff) + g; | |
428 } | |
429 | |
430 if (h) | |
431 return h; | |
432 return 1; | |
433 } | |
434 | |
435 /* Return number of characters in line in M at vpos VPOS, | |
436 except don't count leading and trailing spaces | |
437 unless the terminal requires those to be explicitly output. */ | |
438 | |
439 static unsigned int | |
440 line_draw_cost (m, vpos) | |
764 | 441 struct frame_glyphs *m; |
314 | 442 int vpos; |
443 { | |
444 register GLYPH *beg = m->glyphs[vpos]; | |
445 register GLYPH *end = m->glyphs[vpos] + m->used[vpos]; | |
446 register int i; | |
447 register int tlen = GLYPH_TABLE_LENGTH; | |
448 register Lisp_Object *tbase = GLYPH_TABLE_BASE; | |
449 | |
450 /* Ignore trailing and leading spaces if we can. */ | |
451 if (!must_write_spaces) | |
452 { | |
453 while ((end != beg) && (*end == SPACEGLYPH)) | |
454 --end; | |
455 if (end == beg) | |
456 return (0); /* All blank line. */ | |
457 | |
458 while (*beg == SPACEGLYPH) | |
459 ++beg; | |
460 } | |
461 | |
462 /* If we don't have a glyph-table, each glyph is one character, | |
463 so return the number of glyphs. */ | |
464 if (tbase == 0) | |
465 return end - beg; | |
466 | |
467 /* Otherwise, scan the glyphs and accumulate their total size in I. */ | |
468 i = 0; | |
469 while ((beg <= end) && *beg) | |
470 { | |
471 register GLYPH g = *beg++; | |
472 | |
473 if (GLYPH_SIMPLE_P (tbase, tlen, g)) | |
474 i += 1; | |
475 else | |
476 i += GLYPH_LENGTH (tbase, g); | |
477 } | |
478 return i; | |
479 } | |
480 | |
481 /* The functions on this page are the interface from xdisp.c to redisplay. | |
482 | |
483 The only other interface into redisplay is through setting | |
764 | 484 FRAME_CURSOR_X (frame) and FRAME_CURSOR_Y (frame) |
485 and SET_FRAME_GARBAGED (frame). */ | |
314 | 486 |
487 /* cancel_line eliminates any request to display a line at position `vpos' */ | |
488 | |
764 | 489 cancel_line (vpos, frame) |
314 | 490 int vpos; |
764 | 491 register FRAME_PTR frame; |
314 | 492 { |
764 | 493 FRAME_DESIRED_GLYPHS (frame)->enable[vpos] = 0; |
314 | 494 } |
495 | |
764 | 496 clear_frame_records (frame) |
497 register FRAME_PTR frame; | |
314 | 498 { |
764 | 499 bzero (FRAME_CURRENT_GLYPHS (frame)->enable, FRAME_HEIGHT (frame)); |
314 | 500 } |
501 | |
502 /* Prepare to display on line VPOS starting at HPOS within it. */ | |
503 | |
504 void | |
764 | 505 get_display_line (frame, vpos, hpos) |
506 register FRAME_PTR frame; | |
314 | 507 int vpos; |
508 register int hpos; | |
509 { | |
764 | 510 register struct frame_glyphs *glyphs; |
511 register struct frame_glyphs *desired_glyphs = FRAME_DESIRED_GLYPHS (frame); | |
314 | 512 register GLYPH *p; |
513 | |
1192
5c380ec3cfc6
* dispnew.c (get_display_line): Don't abort if the frame is
Jim Blandy <jimb@redhat.com>
parents:
1042
diff
changeset
|
514 if (vpos < 0) |
314 | 515 abort (); |
516 | |
517 if ((desired_glyphs->enable[vpos]) && desired_glyphs->used[vpos] > hpos) | |
518 abort (); | |
519 | |
520 if (! desired_glyphs->enable[vpos]) | |
521 { | |
522 desired_glyphs->used[vpos] = 0; | |
523 desired_glyphs->highlight[vpos] = 0; | |
524 desired_glyphs->enable[vpos] = 1; | |
525 } | |
526 | |
527 if (hpos > desired_glyphs->used[vpos]) | |
528 { | |
529 GLYPH *g = desired_glyphs->glyphs[vpos] + desired_glyphs->used[vpos]; | |
530 GLYPH *end = desired_glyphs->glyphs[vpos] + hpos; | |
531 | |
532 desired_glyphs->used[vpos] = hpos; | |
533 while (g != end) | |
534 *g++ = SPACEGLYPH; | |
535 } | |
536 } | |
537 | |
538 /* Like bcopy except never gets confused by overlap. */ | |
539 | |
540 void | |
541 safe_bcopy (from, to, size) | |
542 char *from, *to; | |
543 int size; | |
544 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
545 if (size <= 0 || from == to) |
314 | 546 return; |
547 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
548 /* 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
|
549 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
|
550 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
|
551 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
|
552 bcopy (from, to, size); |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
553 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
554 /* 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
|
555 else |
314 | 556 { |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
557 register char *endf = from + size; |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
558 register char *endt = to + size; |
314 | 559 |
560 /* If TO - FROM is large, then we should break the copy into | |
561 nonoverlapping chunks of TO - FROM bytes each. However, if | |
562 TO - FROM is small, then the bcopy function call overhead | |
563 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
|
564 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
|
565 bad, I'm trying to err in its favor. */ |
314 | 566 if (to - from < 64) |
567 { | |
568 do | |
569 *--endt = *--endf; | |
570 while (endf != from); | |
571 } | |
572 else | |
573 { | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
574 for (;;) |
314 | 575 { |
576 endt -= (to - from); | |
577 endf -= (to - from); | |
578 | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
579 if (endt < to) |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
580 break; |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
581 |
314 | 582 bcopy (endf, endt, to - from); |
583 } | |
1588
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
584 |
732a88db381f
* dispnew.c [not MULTI_FRAME] (Fredraw_display): Pass the correct
Jim Blandy <jimb@redhat.com>
parents:
1495
diff
changeset
|
585 /* If SIZE wasn't a multiple of TO - FROM, there will be a |
314 | 586 little left over. The amount left over is |
587 (endt + (to - from)) - to, which is endt - from. */ | |
588 bcopy (from, to, endt - from); | |
589 } | |
590 } | |
591 } | |
592 | |
352 | 593 /* Rotate a vector of SIZE bytes right, by DISTANCE bytes. |
314 | 594 DISTANCE may be negative. */ |
595 | |
596 static void | |
597 rotate_vector (vector, size, distance) | |
598 char *vector; | |
599 int size; | |
600 int distance; | |
601 { | |
602 char *temp = (char *) alloca (size); | |
603 | |
604 if (distance < 0) | |
605 distance += size; | |
606 | |
607 bcopy (vector, temp + distance, size - distance); | |
608 bcopy (vector + size - distance, temp, distance); | |
609 bcopy (temp, vector, size); | |
610 } | |
611 | |
612 /* Scroll lines from vpos FROM up to but not including vpos END | |
613 down by AMOUNT lines (AMOUNT may be negative). | |
614 Returns nonzero if done, zero if terminal cannot scroll them. */ | |
615 | |
616 int | |
6627
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
617 scroll_frame_lines (frame, from, end, amount, newpos) |
764 | 618 register FRAME_PTR frame; |
6627
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
619 int from, end, amount, newpos; |
314 | 620 { |
621 register int i; | |
764 | 622 register struct frame_glyphs *current_frame |
623 = FRAME_CURRENT_GLYPHS (frame); | |
6627
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
624 int pos_adjust; |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
625 int width = FRAME_WIDTH (frame); |
314 | 626 |
627 if (!line_ins_del_ok) | |
628 return 0; | |
629 | |
630 if (amount == 0) | |
631 return 1; | |
632 | |
633 if (amount > 0) | |
634 { | |
764 | 635 update_begin (frame); |
314 | 636 set_terminal_window (end + amount); |
637 if (!scroll_region_ok) | |
638 ins_del_lines (end, -amount); | |
639 ins_del_lines (from, amount); | |
640 set_terminal_window (0); | |
641 | |
764 | 642 rotate_vector (current_frame->glyphs + from, |
314 | 643 sizeof (GLYPH *) * (end + amount - from), |
644 amount * sizeof (GLYPH *)); | |
645 | |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
646 rotate_vector (current_frame->charstarts + from, |
6627
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
647 sizeof (int *) * (end + amount - from), |
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
648 amount * sizeof (int *)); |
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
649 |
764 | 650 safe_bcopy (current_frame->used + from, |
651 current_frame->used + from + amount, | |
652 (end - from) * sizeof current_frame->used[0]); | |
314 | 653 |
764 | 654 safe_bcopy (current_frame->highlight + from, |
655 current_frame->highlight + from + amount, | |
656 (end - from) * sizeof current_frame->highlight[0]); | |
314 | 657 |
764 | 658 safe_bcopy (current_frame->enable + from, |
659 current_frame->enable + from + amount, | |
660 (end - from) * sizeof current_frame->enable[0]); | |
314 | 661 |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
662 /* Adjust the lines by an amount |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
663 that puts the first of them at NEWPOS. */ |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
664 pos_adjust = newpos - current_frame->charstarts[from + amount][0]; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
665 |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
666 /* Offset each char position in the charstarts lines we moved |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
667 by pos_adjust. */ |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
668 for (i = from + amount; i < end + amount; i++) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
669 { |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
670 int *line = current_frame->charstarts[i]; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
671 int col; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
672 for (col = 0; col < width; col++) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
673 if (line[col] > 0) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
674 line[col] += pos_adjust; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
675 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
676 for (i = from; i < from + amount; i++) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
677 { |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
678 int *line = current_frame->charstarts[i]; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
679 int col; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
680 line[0] = -1; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
681 for (col = 0; col < width; col++) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
682 line[col] = 0; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
683 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
684 |
314 | 685 /* Mark the lines made empty by scrolling as enabled, empty and |
686 normal video. */ | |
764 | 687 bzero (current_frame->used + from, |
688 amount * sizeof current_frame->used[0]); | |
689 bzero (current_frame->highlight + from, | |
690 amount * sizeof current_frame->highlight[0]); | |
314 | 691 for (i = from; i < from + amount; i++) |
692 { | |
764 | 693 current_frame->glyphs[i][0] = '\0'; |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
694 current_frame->charstarts[i][0] = -1; |
764 | 695 current_frame->enable[i] = 1; |
314 | 696 } |
697 | |
764 | 698 safe_bcopy (current_frame->bufp + from, |
699 current_frame->bufp + from + amount, | |
700 (end - from) * sizeof current_frame->bufp[0]); | |
314 | 701 |
702 #ifdef HAVE_X_WINDOWS | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
703 if (FRAME_X_P (frame)) |
314 | 704 { |
764 | 705 safe_bcopy (current_frame->top_left_x + from, |
706 current_frame->top_left_x + from + amount, | |
707 (end - from) * sizeof current_frame->top_left_x[0]); | |
314 | 708 |
764 | 709 safe_bcopy (current_frame->top_left_y + from, |
710 current_frame->top_left_y + from + amount, | |
711 (end - from) * sizeof current_frame->top_left_y[0]); | |
314 | 712 |
764 | 713 safe_bcopy (current_frame->pix_width + from, |
714 current_frame->pix_width + from + amount, | |
715 (end - from) * sizeof current_frame->pix_width[0]); | |
314 | 716 |
764 | 717 safe_bcopy (current_frame->pix_height + from, |
718 current_frame->pix_height + from + amount, | |
719 (end - from) * sizeof current_frame->pix_height[0]); | |
1407
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
720 |
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
721 safe_bcopy (current_frame->max_ascent + from, |
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
722 current_frame->max_ascent + from + amount, |
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
723 (end - from) * sizeof current_frame->max_ascent[0]); |
314 | 724 } |
725 #endif /* HAVE_X_WINDOWS */ | |
726 | |
764 | 727 update_end (frame); |
314 | 728 } |
729 if (amount < 0) | |
730 { | |
764 | 731 update_begin (frame); |
314 | 732 set_terminal_window (end); |
733 ins_del_lines (from + amount, amount); | |
734 if (!scroll_region_ok) | |
735 ins_del_lines (end + amount, -amount); | |
736 set_terminal_window (0); | |
737 | |
764 | 738 rotate_vector (current_frame->glyphs + from + amount, |
314 | 739 sizeof (GLYPH *) * (end - from - amount), |
740 amount * sizeof (GLYPH *)); | |
741 | |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
742 rotate_vector (current_frame->charstarts + from + amount, |
6627
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
743 sizeof (int *) * (end - from - amount), |
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
744 amount * sizeof (int *)); |
f8471ecf787b
(make_frame_glyphs): If EMPTY, don't leave junk in ->total_charstarts.
Richard M. Stallman <rms@gnu.org>
parents:
6620
diff
changeset
|
745 |
764 | 746 safe_bcopy (current_frame->used + from, |
747 current_frame->used + from + amount, | |
748 (end - from) * sizeof current_frame->used[0]); | |
314 | 749 |
764 | 750 safe_bcopy (current_frame->highlight + from, |
751 current_frame->highlight + from + amount, | |
752 (end - from) * sizeof current_frame->highlight[0]); | |
314 | 753 |
764 | 754 safe_bcopy (current_frame->enable + from, |
755 current_frame->enable + from + amount, | |
756 (end - from) * sizeof current_frame->enable[0]); | |
314 | 757 |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
758 /* Adjust the lines by an amount |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
759 that puts the first of them at NEWPOS. */ |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
760 pos_adjust = newpos - current_frame->charstarts[from + amount][0]; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
761 |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
762 /* Offset each char position in the charstarts lines we moved |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
763 by pos_adjust. */ |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
764 for (i = from + amount; i < end + amount; i++) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
765 { |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
766 int *line = current_frame->charstarts[i]; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
767 int col; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
768 for (col = 0; col < width; col++) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
769 if (line[col] > 0) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
770 line[col] += pos_adjust; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
771 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
772 for (i = end + amount; i < end; i++) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
773 { |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
774 int *line = current_frame->charstarts[i]; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
775 int col; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
776 line[0] = -1; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
777 for (col = 0; col < width; col++) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
778 line[col] = 0; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
779 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
780 |
314 | 781 /* Mark the lines made empty by scrolling as enabled, empty and |
782 normal video. */ | |
764 | 783 bzero (current_frame->used + end + amount, |
784 - amount * sizeof current_frame->used[0]); | |
785 bzero (current_frame->highlight + end + amount, | |
786 - amount * sizeof current_frame->highlight[0]); | |
314 | 787 for (i = end + amount; i < end; i++) |
788 { | |
764 | 789 current_frame->glyphs[i][0] = '\0'; |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
790 current_frame->charstarts[i][0] = 0; |
764 | 791 current_frame->enable[i] = 1; |
314 | 792 } |
793 | |
764 | 794 safe_bcopy (current_frame->bufp + from, |
795 current_frame->bufp + from + amount, | |
796 (end - from) * sizeof current_frame->bufp[0]); | |
314 | 797 |
798 #ifdef HAVE_X_WINDOWS | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
799 if (FRAME_X_P (frame)) |
314 | 800 { |
764 | 801 safe_bcopy (current_frame->top_left_x + from, |
802 current_frame->top_left_x + from + amount, | |
803 (end - from) * sizeof current_frame->top_left_x[0]); | |
314 | 804 |
764 | 805 safe_bcopy (current_frame->top_left_y + from, |
806 current_frame->top_left_y + from + amount, | |
807 (end - from) * sizeof current_frame->top_left_y[0]); | |
314 | 808 |
764 | 809 safe_bcopy (current_frame->pix_width + from, |
810 current_frame->pix_width + from + amount, | |
811 (end - from) * sizeof current_frame->pix_width[0]); | |
314 | 812 |
764 | 813 safe_bcopy (current_frame->pix_height + from, |
814 current_frame->pix_height + from + amount, | |
815 (end - from) * sizeof current_frame->pix_height[0]); | |
1407
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
816 |
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
817 safe_bcopy (current_frame->max_ascent + from, |
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
818 current_frame->max_ascent + from + amount, |
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
819 (end - from) * sizeof current_frame->max_ascent[0]); |
314 | 820 } |
821 #endif /* HAVE_X_WINDOWS */ | |
822 | |
764 | 823 update_end (frame); |
314 | 824 } |
825 return 1; | |
826 } | |
827 | |
764 | 828 /* After updating a window W that isn't the full frame wide, |
314 | 829 copy all the columns that W does not occupy |
764 | 830 into the FRAME_DESIRED_GLYPHS (frame) from the FRAME_PHYS_GLYPHS (frame) |
831 so that update_frame will not change those columns. */ | |
314 | 832 |
833 preserve_other_columns (w) | |
834 struct window *w; | |
835 { | |
836 register int vpos; | |
764 | 837 register struct frame_glyphs *current_frame, *desired_frame; |
838 register FRAME_PTR frame = XFRAME (w->frame); | |
314 | 839 int start = XFASTINT (w->left); |
840 int end = XFASTINT (w->left) + XFASTINT (w->width); | |
841 int bot = XFASTINT (w->top) + XFASTINT (w->height); | |
842 | |
764 | 843 current_frame = FRAME_CURRENT_GLYPHS (frame); |
844 desired_frame = FRAME_DESIRED_GLYPHS (frame); | |
314 | 845 |
846 for (vpos = XFASTINT (w->top); vpos < bot; vpos++) | |
847 { | |
764 | 848 if (current_frame->enable[vpos] && desired_frame->enable[vpos]) |
314 | 849 { |
850 if (start > 0) | |
851 { | |
852 int len; | |
853 | |
764 | 854 bcopy (current_frame->glyphs[vpos], |
2930
839f3d132ee0
* dispnew.c (preserve_other_columns): Remember to multiply the
Jim Blandy <jimb@redhat.com>
parents:
2794
diff
changeset
|
855 desired_frame->glyphs[vpos], |
8878
066fab036ab5
(preserve_other_columns): Fix arg to sizeof in bcopy call.
Richard M. Stallman <rms@gnu.org>
parents:
8665
diff
changeset
|
856 start * sizeof (current_frame->glyphs[vpos][0])); |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
857 bcopy (current_frame->charstarts[vpos], |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
858 desired_frame->charstarts[vpos], |
8878
066fab036ab5
(preserve_other_columns): Fix arg to sizeof in bcopy call.
Richard M. Stallman <rms@gnu.org>
parents:
8665
diff
changeset
|
859 start * sizeof (current_frame->charstarts[vpos][0])); |
764 | 860 len = min (start, current_frame->used[vpos]); |
861 if (desired_frame->used[vpos] < len) | |
862 desired_frame->used[vpos] = len; | |
314 | 863 } |
764 | 864 if (current_frame->used[vpos] > end |
865 && desired_frame->used[vpos] < current_frame->used[vpos]) | |
314 | 866 { |
764 | 867 while (desired_frame->used[vpos] < end) |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
868 { |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
869 int used = desired_frame->used[vpos]++; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
870 desired_frame->glyphs[vpos][used] = SPACEGLYPH; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
871 desired_frame->glyphs[vpos][used] = 0; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
872 } |
764 | 873 bcopy (current_frame->glyphs[vpos] + end, |
874 desired_frame->glyphs[vpos] + end, | |
2930
839f3d132ee0
* dispnew.c (preserve_other_columns): Remember to multiply the
Jim Blandy <jimb@redhat.com>
parents:
2794
diff
changeset
|
875 ((current_frame->used[vpos] - end) |
8878
066fab036ab5
(preserve_other_columns): Fix arg to sizeof in bcopy call.
Richard M. Stallman <rms@gnu.org>
parents:
8665
diff
changeset
|
876 * sizeof (current_frame->glyphs[vpos][0]))); |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
877 bcopy (current_frame->charstarts[vpos] + end, |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
878 desired_frame->charstarts[vpos] + end, |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
879 ((current_frame->used[vpos] - end) |
8878
066fab036ab5
(preserve_other_columns): Fix arg to sizeof in bcopy call.
Richard M. Stallman <rms@gnu.org>
parents:
8665
diff
changeset
|
880 * sizeof (current_frame->charstarts[vpos][0]))); |
764 | 881 desired_frame->used[vpos] = current_frame->used[vpos]; |
314 | 882 } |
883 } | |
884 } | |
885 } | |
886 | |
887 #if 0 | |
888 | |
764 | 889 /* If window w does not need to be updated and isn't the full frame wide, |
314 | 890 copy all the columns that w does occupy |
764 | 891 into the FRAME_DESIRED_LINES (frame) from the FRAME_PHYS_LINES (frame) |
892 so that update_frame will not change those columns. | |
314 | 893 |
894 Have not been able to figure out how to use this correctly. */ | |
895 | |
896 preserve_my_columns (w) | |
897 struct window *w; | |
898 { | |
899 register int vpos, fin; | |
764 | 900 register struct frame_glyphs *l1, *l2; |
901 register FRAME_PTR frame = XFRAME (w->frame); | |
314 | 902 int start = XFASTINT (w->left); |
903 int end = XFASTINT (w->left) + XFASTINT (w->width); | |
904 int bot = XFASTINT (w->top) + XFASTINT (w->height); | |
905 | |
906 for (vpos = XFASTINT (w->top); vpos < bot; vpos++) | |
907 { | |
764 | 908 if ((l1 = FRAME_DESIRED_GLYPHS (frame)->glyphs[vpos + 1]) |
909 && (l2 = FRAME_PHYS_GLYPHS (frame)->glyphs[vpos + 1])) | |
314 | 910 { |
911 if (l2->length > start && l1->length < l2->length) | |
912 { | |
913 fin = l2->length; | |
914 if (fin > end) fin = end; | |
915 while (l1->length < start) | |
916 l1->body[l1->length++] = ' '; | |
917 bcopy (l2->body + start, l1->body + start, fin - start); | |
918 l1->length = fin; | |
919 } | |
920 } | |
921 } | |
922 } | |
923 | |
924 #endif | |
925 | |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
926 /* Adjust by ADJUST the charstart values in window W |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
927 after vpos VPOS, which counts relative to the frame |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
928 (not relative to W itself). */ |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
929 |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
930 void |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
931 adjust_window_charstarts (w, vpos, adjust) |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
932 struct window *w; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
933 int vpos; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
934 int adjust; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
935 { |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
936 int left = XFASTINT (w->left); |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
937 int top = XFASTINT (w->top); |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
938 int right = left + window_internal_width (w); |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
939 int bottom = top + window_internal_height (w); |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
940 int i; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
941 |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
942 for (i = vpos + 1; i < bottom; i++) |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
943 { |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
944 int *charstart |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
945 = FRAME_CURRENT_GLYPHS (XFRAME (WINDOW_FRAME (w)))->charstarts[i]; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
946 int j; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
947 for (j = left; j < right; j++) |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
948 if (charstart[j] > 0) |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
949 charstart[j] += adjust; |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
950 } |
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
951 } |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
952 |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
953 /* Check the charstarts values in the area of window W |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
954 for internal consistency. We cannot check that they are "right"; |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
955 we can only look for something nonsensical. */ |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
956 |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
957 verify_charstarts (w) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
958 struct window *w; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
959 { |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
960 FRAME_PTR f = XFRAME (WINDOW_FRAME (w)); |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
961 int i; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
962 int top = XFASTINT (w->top); |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
963 int bottom = top + window_internal_height (w); |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
964 int left = XFASTINT (w->left); |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
965 int right = left + window_internal_width (w); |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
966 int next_line; |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
967 int truncate = (XINT (w->hscroll) |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
968 || (truncate_partial_width_windows |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
969 && (XFASTINT (w->width) < FRAME_WIDTH (f))) |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
970 || !NILP (XBUFFER (w->buffer)->truncate_lines)); |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
971 |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
972 for (i = top; i < bottom; i++) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
973 { |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
974 int j; |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
975 int last; |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
976 int *charstart = FRAME_CURRENT_GLYPHS (f)->charstarts[i]; |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
977 |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
978 if (i != top) |
6682
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
979 { |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
980 if (truncate) |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
981 { |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
982 /* If we are truncating lines, allow a jump |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
983 in charstarts from one line to the next. */ |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
984 if (charstart[left] < next_line) |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
985 abort (); |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
986 } |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
987 else |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
988 { |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
989 if (charstart[left] != next_line) |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
990 abort (); |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
991 } |
16ab14205588
(verify_charstarts): Handle truncation of lines.
Richard M. Stallman <rms@gnu.org>
parents:
6648
diff
changeset
|
992 } |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
993 |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
994 for (j = left; j < right; j++) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
995 if (charstart[j] > 0) |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
996 last = charstart[j]; |
6645
ba0c1af167e6
(verify_charstarts): Count right for continued lines.
Richard M. Stallman <rms@gnu.org>
parents:
6642
diff
changeset
|
997 /* Record where the next line should start. */ |
ba0c1af167e6
(verify_charstarts): Count right for continued lines.
Richard M. Stallman <rms@gnu.org>
parents:
6642
diff
changeset
|
998 next_line = last; |
ba0c1af167e6
(verify_charstarts): Count right for continued lines.
Richard M. Stallman <rms@gnu.org>
parents:
6642
diff
changeset
|
999 if (BUF_ZV (XBUFFER (w->buffer)) != last) |
ba0c1af167e6
(verify_charstarts): Count right for continued lines.
Richard M. Stallman <rms@gnu.org>
parents:
6642
diff
changeset
|
1000 { |
ba0c1af167e6
(verify_charstarts): Count right for continued lines.
Richard M. Stallman <rms@gnu.org>
parents:
6642
diff
changeset
|
1001 /* If there's a newline between the two lines, count that. */ |
ba0c1af167e6
(verify_charstarts): Count right for continued lines.
Richard M. Stallman <rms@gnu.org>
parents:
6642
diff
changeset
|
1002 int endchar = *BUF_CHAR_ADDRESS (XBUFFER (w->buffer), last); |
ba0c1af167e6
(verify_charstarts): Count right for continued lines.
Richard M. Stallman <rms@gnu.org>
parents:
6642
diff
changeset
|
1003 if (endchar == '\n') |
ba0c1af167e6
(verify_charstarts): Count right for continued lines.
Richard M. Stallman <rms@gnu.org>
parents:
6642
diff
changeset
|
1004 next_line++; |
ba0c1af167e6
(verify_charstarts): Count right for continued lines.
Richard M. Stallman <rms@gnu.org>
parents:
6642
diff
changeset
|
1005 } |
6642
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
1006 } |
2fda5dd17356
(verify_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6627
diff
changeset
|
1007 } |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
1008 |
314 | 1009 /* On discovering that the redisplay for a window was no good, |
1010 cancel the columns of that window, so that when the window is | |
1011 displayed over again get_display_line will not complain. */ | |
1012 | |
1013 cancel_my_columns (w) | |
1014 struct window *w; | |
1015 { | |
1016 register int vpos; | |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1017 register struct frame_glyphs *desired_glyphs |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1018 = FRAME_DESIRED_GLYPHS (XFRAME (w->frame)); |
314 | 1019 register int start = XFASTINT (w->left); |
1020 register int bot = XFASTINT (w->top) + XFASTINT (w->height); | |
1021 | |
1022 for (vpos = XFASTINT (w->top); vpos < bot; vpos++) | |
1023 if (desired_glyphs->enable[vpos] | |
1024 && desired_glyphs->used[vpos] >= start) | |
1025 desired_glyphs->used[vpos] = start; | |
1026 } | |
1027 | |
764 | 1028 /* These functions try to perform directly and immediately on the frame |
314 | 1029 the necessary output for one change in the buffer. |
1030 They may return 0 meaning nothing was done if anything is difficult, | |
1031 or 1 meaning the output was performed properly. | |
764 | 1032 They assume that the frame was up to date before the buffer |
1495
f17665e7347e
(count_blanks): Leave argument r constant, and increment p.
Richard M. Stallman <rms@gnu.org>
parents:
1407
diff
changeset
|
1033 change being displayed. They make various other assumptions too; |
314 | 1034 see command_loop_1 where these are called. */ |
1035 | |
1036 int | |
1037 direct_output_for_insert (g) | |
1038 int g; | |
1039 { | |
764 | 1040 register FRAME_PTR frame = selected_frame; |
1041 register struct frame_glyphs *current_frame | |
1042 = FRAME_CURRENT_GLYPHS (frame); | |
314 | 1043 |
1044 #ifndef COMPILER_REGISTER_BUG | |
1045 register | |
1046 #endif /* COMPILER_REGISTER_BUG */ | |
1047 struct window *w = XWINDOW (selected_window); | |
1048 #ifndef COMPILER_REGISTER_BUG | |
1049 register | |
1050 #endif /* COMPILER_REGISTER_BUG */ | |
764 | 1051 int hpos = FRAME_CURSOR_X (frame); |
314 | 1052 #ifndef COMPILER_REGISTER_BUG |
1053 register | |
1054 #endif /* COMPILER_REGISTER_BUG */ | |
764 | 1055 int vpos = FRAME_CURSOR_Y (frame); |
314 | 1056 |
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1766
diff
changeset
|
1057 /* Give up if about to continue line. */ |
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1766
diff
changeset
|
1058 if (hpos >= XFASTINT (w->left) + window_internal_width (w) - 1 |
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1766
diff
changeset
|
1059 |
314 | 1060 /* Avoid losing if cursor is in invisible text off left margin */ |
1061 || (XINT (w->hscroll) && hpos == XFASTINT (w->left)) | |
1062 | |
1063 /* Give up if cursor outside window (in minibuf, probably) */ | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1064 || cursor_in_echo_area |
764 | 1065 || FRAME_CURSOR_Y (frame) < XFASTINT (w->top) |
1066 || FRAME_CURSOR_Y (frame) >= XFASTINT (w->top) + XFASTINT (w->height) | |
314 | 1067 |
764 | 1068 /* Give up if cursor not really at FRAME_CURSOR_X, FRAME_CURSOR_Y */ |
314 | 1069 || !display_completed |
1070 | |
1071 /* Give up if buffer appears in two places. */ | |
1072 || buffer_shared > 1 | |
1073 | |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1074 #ifdef USE_TEXT_PROPERTIES |
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1075 /* Intervals have already been adjusted, point is after the |
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1076 character that was just inserted. */ |
6068
f67817990735
(direct_output_for_insert): Fix comment.
Karl Heuer <kwzh@gnu.org>
parents:
5885
diff
changeset
|
1077 /* Give up if character is invisible. */ |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1078 /* Give up if character has a face property. |
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1079 At the moment we only lose at end of line or end of buffer |
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1080 and only with faces that have some background */ |
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1081 /* Instead of wasting time, give up if character has any text properties */ |
8903
03597c3eb63b
(direct_output_for_insert, direct_output_forward_char): Fix Lisp_Object
Karl Heuer <kwzh@gnu.org>
parents:
8878
diff
changeset
|
1082 || ! NILP (Ftext_properties_at (make_number (point - 1), Qnil)) |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1083 #endif |
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1084 |
314 | 1085 /* Give up if w is minibuffer and a message is being displayed there */ |
1086 || (MINI_WINDOW_P (w) && echo_area_glyphs)) | |
1087 return 0; | |
1088 | |
2778
071fa2f469d7
* dispnew.c (direct_output_for_insert): Compute the face of the
Jim Blandy <jimb@redhat.com>
parents:
2648
diff
changeset
|
1089 { |
8301
c01188c50e70
(direct_output_for_insert): Dpn't call compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
8286
diff
changeset
|
1090 int face = 0; |
9572 | 1091 #ifdef HAVE_FACES |
2778
071fa2f469d7
* dispnew.c (direct_output_for_insert): Compute the face of the
Jim Blandy <jimb@redhat.com>
parents:
2648
diff
changeset
|
1092 int dummy; |
8301
c01188c50e70
(direct_output_for_insert): Dpn't call compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
8286
diff
changeset
|
1093 |
c01188c50e70
(direct_output_for_insert): Dpn't call compute_char_face
Richard M. Stallman <rms@gnu.org>
parents:
8286
diff
changeset
|
1094 if (FRAME_X_P (frame)) |
8394
b5d2495d6553
(direct_output_for_insert): Pass missing 8th
Richard M. Stallman <rms@gnu.org>
parents:
8301
diff
changeset
|
1095 face = compute_char_face (frame, w, point - 1, -1, -1, &dummy, point, 0); |
2778
071fa2f469d7
* dispnew.c (direct_output_for_insert): Compute the face of the
Jim Blandy <jimb@redhat.com>
parents:
2648
diff
changeset
|
1096 #endif |
6414
d681b16231a8
(direct_output_for_insert): Handle termcap frames as well as X.
Karl Heuer <kwzh@gnu.org>
parents:
6349
diff
changeset
|
1097 current_frame->glyphs[vpos][hpos] = MAKE_GLYPH (frame, g, face); |
6648
c7eefaee311c
(direct_output_for_insert): Add charstarts entry after the new char.
Richard M. Stallman <rms@gnu.org>
parents:
6645
diff
changeset
|
1098 current_frame->charstarts[vpos][hpos] = point - 1; |
c7eefaee311c
(direct_output_for_insert): Add charstarts entry after the new char.
Richard M. Stallman <rms@gnu.org>
parents:
6645
diff
changeset
|
1099 /* Record the entry for after the newly inserted character. */ |
c7eefaee311c
(direct_output_for_insert): Add charstarts entry after the new char.
Richard M. Stallman <rms@gnu.org>
parents:
6645
diff
changeset
|
1100 current_frame->charstarts[vpos][hpos + 1] = point; |
6620
990d7d5095dc
(adjust_window_charstarts): New function.
Richard M. Stallman <rms@gnu.org>
parents:
6617
diff
changeset
|
1101 adjust_window_charstarts (w, vpos, 1); |
2778
071fa2f469d7
* dispnew.c (direct_output_for_insert): Compute the face of the
Jim Blandy <jimb@redhat.com>
parents:
2648
diff
changeset
|
1102 } |
314 | 1103 unchanged_modified = MODIFF; |
1104 beg_unchanged = GPT - BEG; | |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
1105 XSETFASTINT (w->last_point, point); |
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
1106 XSETFASTINT (w->last_point_x, hpos); |
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
1107 XSETFASTINT (w->last_modified, MODIFF); |
314 | 1108 |
1109 reassert_line_highlight (0, vpos); | |
764 | 1110 write_glyphs (¤t_frame->glyphs[vpos][hpos], 1); |
314 | 1111 fflush (stdout); |
764 | 1112 ++FRAME_CURSOR_X (frame); |
1113 if (hpos == current_frame->used[vpos]) | |
314 | 1114 { |
764 | 1115 current_frame->used[vpos] = hpos + 1; |
1116 current_frame->glyphs[vpos][hpos + 1] = 0; | |
314 | 1117 } |
1118 | |
1119 return 1; | |
1120 } | |
1121 | |
1122 int | |
1123 direct_output_forward_char (n) | |
1124 int n; | |
1125 { | |
764 | 1126 register FRAME_PTR frame = selected_frame; |
314 | 1127 register struct window *w = XWINDOW (selected_window); |
8903
03597c3eb63b
(direct_output_for_insert, direct_output_forward_char): Fix Lisp_Object
Karl Heuer <kwzh@gnu.org>
parents:
8878
diff
changeset
|
1128 Lisp_Object position; |
5223
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
1129 int hpos = FRAME_CURSOR_X (frame); |
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
1130 |
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
1131 /* Give up if in truncated text at end of line. */ |
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
1132 if (hpos >= XFASTINT (w->left) + window_internal_width (w) - 1) |
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
1133 return 0; |
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
1134 |
543 | 1135 /* Avoid losing if cursor is in invisible text off left margin |
1136 or about to go off either side of window. */ | |
764 | 1137 if ((FRAME_CURSOR_X (frame) == XFASTINT (w->left) |
543 | 1138 && (XINT (w->hscroll) || n < 0)) |
1139 || (n > 0 | |
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1766
diff
changeset
|
1140 && (FRAME_CURSOR_X (frame) + 1 >= window_internal_width (w) - 1)) |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1141 || cursor_in_echo_area) |
314 | 1142 return 0; |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1143 |
2794
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
1144 /* 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
|
1145 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
|
1146 return 0; |
9163e4e4752c
(direct_output_forward_char): Just give up
Richard M. Stallman <rms@gnu.org>
parents:
2778
diff
changeset
|
1147 |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1148 #ifdef USE_TEXT_PROPERTIES |
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1149 /* Don't use direct output next to an invisible character |
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1150 since we might need to do something special. */ |
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1151 |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
1152 XSETFASTINT (position, point); |
4551
1abd3007cbb6
(direct_output_forward_char): Fix previous change:
Richard M. Stallman <rms@gnu.org>
parents:
4384
diff
changeset
|
1153 if (XFASTINT (position) < ZV |
6069
07045ca8ff19
(direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
6068
diff
changeset
|
1154 && ! NILP (Fget_char_property (position, |
4551
1abd3007cbb6
(direct_output_forward_char): Fix previous change:
Richard M. Stallman <rms@gnu.org>
parents:
4384
diff
changeset
|
1155 Qinvisible, |
6069
07045ca8ff19
(direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
6068
diff
changeset
|
1156 selected_window))) |
07045ca8ff19
(direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
6068
diff
changeset
|
1157 return 0; |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1158 |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
1159 XSETFASTINT (position, point - 1); |
4551
1abd3007cbb6
(direct_output_forward_char): Fix previous change:
Richard M. Stallman <rms@gnu.org>
parents:
4384
diff
changeset
|
1160 if (XFASTINT (position) >= BEGV |
6069
07045ca8ff19
(direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
6068
diff
changeset
|
1161 && ! NILP (Fget_char_property (position, |
4551
1abd3007cbb6
(direct_output_forward_char): Fix previous change:
Richard M. Stallman <rms@gnu.org>
parents:
4384
diff
changeset
|
1162 Qinvisible, |
6069
07045ca8ff19
(direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
6068
diff
changeset
|
1163 selected_window))) |
07045ca8ff19
(direct_output_forward_char): Use Fget_char_property to test for invisibility.
Karl Heuer <kwzh@gnu.org>
parents:
6068
diff
changeset
|
1164 return 0; |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1165 #endif |
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1166 |
764 | 1167 FRAME_CURSOR_X (frame) += n; |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
1168 XSETFASTINT (w->last_point_x, FRAME_CURSOR_X (frame)); |
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
1169 XSETFASTINT (w->last_point, point); |
764 | 1170 cursor_to (FRAME_CURSOR_Y (frame), FRAME_CURSOR_X (frame)); |
314 | 1171 fflush (stdout); |
4384
98605d0ea3cf
(direct_output_for_insert): Fail if character
Richard M. Stallman <rms@gnu.org>
parents:
4290
diff
changeset
|
1172 |
314 | 1173 return 1; |
1174 } | |
1175 | |
1176 static void update_line (); | |
1177 | |
764 | 1178 /* Update frame F based on the data in FRAME_DESIRED_GLYPHS. |
314 | 1179 Value is nonzero if redisplay stopped due to pending input. |
1180 FORCE nonzero means do not stop for pending input. */ | |
1181 | |
1182 int | |
764 | 1183 update_frame (f, force, inhibit_hairy_id) |
1184 FRAME_PTR f; | |
314 | 1185 int force; |
1186 int inhibit_hairy_id; | |
1187 { | |
7179
cb958b7d5fe1
(update_frame): Move assignments to current_frame and desired_frame.
Richard M. Stallman <rms@gnu.org>
parents:
6857
diff
changeset
|
1188 register struct frame_glyphs *current_frame; |
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
1189 register struct frame_glyphs *desired_frame = 0; |
314 | 1190 register int i; |
1191 int pause; | |
1192 int preempt_count = baud_rate / 2400 + 1; | |
1193 extern input_pending; | |
1194 #ifdef HAVE_X_WINDOWS | |
1195 register int downto, leftmost; | |
1196 #endif | |
1197 | |
10122
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
1198 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
|
1199 calculate_costs (f); |
3de6776ae141
(update_frame): Call calculate_costs if baud_rate changed.
Richard M. Stallman <rms@gnu.org>
parents:
9963
diff
changeset
|
1200 |
3357
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
1201 if (preempt_count <= 0) |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
1202 preempt_count = 1; |
d9523a958b3c
(update_frame): Make preempt_count positive.
Richard M. Stallman <rms@gnu.org>
parents:
3317
diff
changeset
|
1203 |
764 | 1204 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */ |
314 | 1205 |
1206 detect_input_pending (); | |
1207 if (input_pending && !force) | |
1208 { | |
1209 pause = 1; | |
1210 goto do_pause; | |
1211 } | |
1212 | |
764 | 1213 update_begin (f); |
314 | 1214 |
1215 if (!line_ins_del_ok) | |
1216 inhibit_hairy_id = 1; | |
1217 | |
7188
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
1218 /* These are separate to avoid a possible bug in the AIX C compiler. */ |
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
1219 current_frame = FRAME_CURRENT_GLYPHS (f); |
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
1220 desired_frame = FRAME_DESIRED_GLYPHS (f); |
7da4ad9a2a8f
(update_frame): Move those assignments even farther down.
Richard M. Stallman <rms@gnu.org>
parents:
7179
diff
changeset
|
1221 |
493 | 1222 /* See if any of the desired lines are enabled; don't compute for |
1223 i/d line if just want cursor motion. */ | |
764 | 1224 for (i = 0; i < FRAME_HEIGHT (f); i++) |
1225 if (desired_frame->enable[i]) | |
314 | 1226 break; |
1227 | |
1228 /* Try doing i/d line, if not yet inhibited. */ | |
764 | 1229 if (!inhibit_hairy_id && i < FRAME_HEIGHT (f)) |
1230 force |= scrolling (f); | |
314 | 1231 |
1232 /* Update the individual lines as needed. Do bottom line first. */ | |
1233 | |
764 | 1234 if (desired_frame->enable[FRAME_HEIGHT (f) - 1]) |
1235 update_line (f, FRAME_HEIGHT (f) - 1); | |
314 | 1236 |
1237 #ifdef HAVE_X_WINDOWS | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1238 if (FRAME_X_P (f)) |
314 | 1239 { |
764 | 1240 leftmost = downto = f->display.x->internal_border_width; |
1241 if (desired_frame->enable[0]) | |
314 | 1242 { |
764 | 1243 current_frame->top_left_x[FRAME_HEIGHT (f) - 1] = leftmost; |
1244 current_frame->top_left_y[FRAME_HEIGHT (f) - 1] | |
1245 = PIXEL_HEIGHT (f) - f->display.x->internal_border_width | |
1407
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
1246 - current_frame->pix_height[FRAME_HEIGHT (f) - 1]; |
764 | 1247 current_frame->top_left_x[0] = leftmost; |
1248 current_frame->top_left_y[0] = downto; | |
314 | 1249 } |
1250 } | |
1251 #endif /* HAVE_X_WINDOWS */ | |
1252 | |
1253 /* Now update the rest of the lines. */ | |
764 | 1254 for (i = 0; i < FRAME_HEIGHT (f) - 1 && (force || !input_pending); i++) |
314 | 1255 { |
764 | 1256 if (desired_frame->enable[i]) |
314 | 1257 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1258 if (FRAME_TERMCAP_P (f)) |
314 | 1259 { |
1260 /* Flush out every so many lines. | |
1261 Also flush out if likely to have more than 1k buffered | |
1262 otherwise. I'm told that some telnet connections get | |
1263 really screwed by more than 1k output at once. */ | |
1264 int outq = PENDING_OUTPUT_COUNT (stdout); | |
1265 if (outq > 900 | |
1266 || (outq > 20 && ((i - 1) % preempt_count == 0))) | |
1267 { | |
1268 fflush (stdout); | |
1269 if (preempt_count == 1) | |
1270 { | |
554 | 1271 #ifdef EMACS_OUTQSIZE |
1272 if (EMACS_OUTQSIZE (0, &outq) < 0) | |
314 | 1273 /* Probably not a tty. Ignore the error and reset |
1274 * the outq count. */ | |
1275 outq = PENDING_OUTPUT_COUNT (stdout); | |
1276 #endif | |
1277 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
|
1278 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
|
1279 sleep (outq / baud_rate); |
314 | 1280 } |
1281 } | |
1282 if ((i - 1) % preempt_count == 0) | |
1283 detect_input_pending (); | |
1284 } | |
1285 | |
764 | 1286 update_line (f, i); |
314 | 1287 #ifdef HAVE_X_WINDOWS |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1288 if (FRAME_X_P (f)) |
314 | 1289 { |
764 | 1290 current_frame->top_left_y[i] = downto; |
1291 current_frame->top_left_x[i] = leftmost; | |
314 | 1292 } |
1293 #endif /* HAVE_X_WINDOWS */ | |
1294 } | |
1295 | |
732 | 1296 #ifdef HAVE_X_WINDOWS |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1297 if (FRAME_X_P (f)) |
1407
0f214040f708
* dispnew.c (scroll_frame_lines): All references to frame elements
Joseph Arceneaux <jla@gnu.org>
parents:
1192
diff
changeset
|
1298 downto += current_frame->pix_height[i]; |
732 | 1299 #endif |
314 | 1300 } |
764 | 1301 pause = (i < FRAME_HEIGHT (f) - 1) ? i : 0; |
314 | 1302 |
1303 /* Now just clean up termcap drivers and set cursor, etc. */ | |
1304 if (!pause) | |
1305 { | |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1306 if (cursor_in_echo_area |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1307 && FRAME_HAS_MINIBUF_P (f)) |
708 | 1308 { |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1309 int top = XINT (XWINDOW (FRAME_MINIBUF_WINDOW (f))->top); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1310 int row, col; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1311 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1312 if (cursor_in_echo_area < 0) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1313 { |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1314 row = top; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1315 col = 0; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1316 } |
708 | 1317 else |
1042
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1318 { |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1319 /* If the minibuffer is several lines high, find the last |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1320 line that has any text on it. */ |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1321 row = FRAME_HEIGHT (f); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1322 do |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1323 { |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1324 row--; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1325 if (current_frame->enable[row]) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1326 col = current_frame->used[row]; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1327 else |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1328 col = 0; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1329 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1330 while (row > top && col == 0); |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1331 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1332 if (col >= FRAME_WIDTH (f)) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1333 { |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1334 col = 0; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1335 if (row < FRAME_HEIGHT (f) - 1) |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1336 row++; |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1337 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1338 } |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1339 |
41b77a76b885
* dispnew.c: Incude "systty.h", not "systerm.h".
Jim Blandy <jimb@redhat.com>
parents:
1003
diff
changeset
|
1340 cursor_to (row, col); |
708 | 1341 } |
314 | 1342 else |
764 | 1343 cursor_to (FRAME_CURSOR_Y (f), max (min (FRAME_CURSOR_X (f), |
1344 FRAME_WIDTH (f) - 1), 0)); | |
314 | 1345 } |
1346 | |
764 | 1347 update_end (f); |
314 | 1348 |
1349 if (termscript) | |
1350 fflush (termscript); | |
1351 fflush (stdout); | |
1352 | |
1353 /* Here if output is preempted because input is detected. */ | |
1354 do_pause: | |
1355 | |
764 | 1356 if (FRAME_HEIGHT (f) == 0) abort (); /* Some bug zeros some core */ |
314 | 1357 display_completed = !pause; |
1358 | |
7247
bead6db0bbf2
(update_frame): Fix previous change: unconditionally bzero at the end.
Richard M. Stallman <rms@gnu.org>
parents:
7188
diff
changeset
|
1359 bzero (FRAME_DESIRED_GLYPHS (f)->enable, FRAME_HEIGHT (f)); |
314 | 1360 return pause; |
1361 } | |
1362 | |
1363 /* Called when about to quit, to check for doing so | |
1364 at an improper time. */ | |
1365 | |
1366 void | |
1367 quit_error_check () | |
1368 { | |
764 | 1369 if (FRAME_DESIRED_GLYPHS (selected_frame) == 0) |
314 | 1370 return; |
764 | 1371 if (FRAME_DESIRED_GLYPHS (selected_frame)->enable[0]) |
314 | 1372 abort (); |
764 | 1373 if (FRAME_DESIRED_GLYPHS (selected_frame)->enable[FRAME_HEIGHT (selected_frame) - 1]) |
314 | 1374 abort (); |
1375 } | |
1376 | |
1377 /* Decide what insert/delete line to do, and do it */ | |
1378 | |
1379 extern void scrolling_1 (); | |
1380 | |
764 | 1381 scrolling (frame) |
1382 FRAME_PTR frame; | |
314 | 1383 { |
1384 int unchanged_at_top, unchanged_at_bottom; | |
1385 int window_size; | |
1386 int changed_lines; | |
764 | 1387 int *old_hash = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); |
1388 int *new_hash = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); | |
1389 int *draw_cost = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); | |
10259
48e4dfc6bb43
(scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents:
10122
diff
changeset
|
1390 int *old_draw_cost = (int *) alloca (FRAME_HEIGHT (frame) * sizeof (int)); |
314 | 1391 register int i; |
764 | 1392 int free_at_end_vpos = FRAME_HEIGHT (frame); |
1393 register struct frame_glyphs *current_frame = FRAME_CURRENT_GLYPHS (frame); | |
1394 register struct frame_glyphs *desired_frame = FRAME_DESIRED_GLYPHS (frame); | |
314 | 1395 |
1396 /* Compute hash codes of all the lines. | |
1397 Also calculate number of changed lines, | |
1398 number of unchanged lines at the beginning, | |
1399 and number of unchanged lines at the end. */ | |
1400 | |
1401 changed_lines = 0; | |
1402 unchanged_at_top = 0; | |
764 | 1403 unchanged_at_bottom = FRAME_HEIGHT (frame); |
1404 for (i = 0; i < FRAME_HEIGHT (frame); i++) | |
314 | 1405 { |
1406 /* Give up on this scrolling if some old lines are not enabled. */ | |
764 | 1407 if (!current_frame->enable[i]) |
314 | 1408 return 0; |
764 | 1409 old_hash[i] = line_hash_code (current_frame, i); |
1410 if (! desired_frame->enable[i]) | |
314 | 1411 new_hash[i] = old_hash[i]; |
1412 else | |
764 | 1413 new_hash[i] = line_hash_code (desired_frame, i); |
314 | 1414 |
1415 if (old_hash[i] != new_hash[i]) | |
1416 { | |
1417 changed_lines++; | |
764 | 1418 unchanged_at_bottom = FRAME_HEIGHT (frame) - i - 1; |
314 | 1419 } |
1420 else if (i == unchanged_at_top) | |
1421 unchanged_at_top++; | |
764 | 1422 draw_cost[i] = line_draw_cost (desired_frame, i); |
10259
48e4dfc6bb43
(scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents:
10122
diff
changeset
|
1423 old_draw_cost[i] = line_draw_cost (current_frame, i); |
314 | 1424 } |
1425 | |
1426 /* If changed lines are few, don't allow preemption, don't scroll. */ | |
10259
48e4dfc6bb43
(scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents:
10122
diff
changeset
|
1427 if (!scroll_region_ok && changed_lines < baud_rate / 2400 |
764 | 1428 || unchanged_at_bottom == FRAME_HEIGHT (frame)) |
314 | 1429 return 1; |
1430 | |
764 | 1431 window_size = (FRAME_HEIGHT (frame) - unchanged_at_top |
314 | 1432 - unchanged_at_bottom); |
1433 | |
1434 if (scroll_region_ok) | |
1435 free_at_end_vpos -= unchanged_at_bottom; | |
764 | 1436 else if (memory_below_frame) |
314 | 1437 free_at_end_vpos = -1; |
1438 | |
1439 /* If large window, fast terminal and few lines in common between | |
764 | 1440 current frame and desired frame, don't bother with i/d calc. */ |
10259
48e4dfc6bb43
(scrolling): Fewer restrictions if scroll_region_ok is
Richard M. Stallman <rms@gnu.org>
parents:
10122
diff
changeset
|
1441 if (!scroll_region_ok && window_size >= 18 && baud_rate > 2400 |
314 | 1442 && (window_size >= |
1443 10 * scrolling_max_lines_saved (unchanged_at_top, | |
764 | 1444 FRAME_HEIGHT (frame) - unchanged_at_bottom, |
314 | 1445 old_hash, new_hash, draw_cost))) |
1446 return 0; | |
1447 | |
764 | 1448 scrolling_1 (frame, window_size, unchanged_at_top, unchanged_at_bottom, |
314 | 1449 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
|
1450 old_draw_cost + unchanged_at_top - 1, |
314 | 1451 old_hash + unchanged_at_top - 1, |
1452 new_hash + unchanged_at_top - 1, | |
1453 free_at_end_vpos - unchanged_at_top); | |
1454 | |
1455 return 0; | |
1456 } | |
1457 | |
1458 /* Return the offset in its buffer of the character at location col, line | |
1459 in the given window. */ | |
1460 int | |
1461 buffer_posn_from_coords (window, col, line) | |
1462 struct window *window; | |
1463 int col, line; | |
1464 { | |
5885
b649c51e3f6b
(buffer_posn_from_coords): Take hscroll into account.
Karl Heuer <kwzh@gnu.org>
parents:
5619
diff
changeset
|
1465 int hscroll = XINT (window->hscroll); |
314 | 1466 int window_left = XFASTINT (window->left); |
1467 | |
1468 /* The actual width of the window is window->width less one for the | |
493 | 1469 DISP_CONTINUE_GLYPH, and less one if it's not the rightmost |
1470 window. */ | |
1777
4edfaa19c7a7
* window.c (window_internal_width): New function.
Jim Blandy <jimb@redhat.com>
parents:
1766
diff
changeset
|
1471 int window_width = window_internal_width (window) - 1; |
314 | 1472 |
493 | 1473 int startp = marker_position (window->start); |
314 | 1474 |
1475 /* Since compute_motion will only operate on the current buffer, | |
1476 we need to save the old one and restore it when we're done. */ | |
1477 struct buffer *old_current_buffer = current_buffer; | |
493 | 1478 struct position *posn; |
314 | 1479 |
1480 current_buffer = XBUFFER (window->buffer); | |
1481 | |
764 | 1482 /* It would be nice if we could use FRAME_CURRENT_GLYPHS (XFRAME |
1483 (window->frame))->bufp to avoid scanning from the very top of | |
493 | 1484 the window, but it isn't maintained correctly, and I'm not even |
1485 sure I will keep it. */ | |
1486 posn = compute_motion (startp, 0, | |
1487 (window == XWINDOW (minibuf_window) && startp == 1 | |
5885
b649c51e3f6b
(buffer_posn_from_coords): Take hscroll into account.
Karl Heuer <kwzh@gnu.org>
parents:
5619
diff
changeset
|
1488 ? minibuf_prompt_width : 0) |
b649c51e3f6b
(buffer_posn_from_coords): Take hscroll into account.
Karl Heuer <kwzh@gnu.org>
parents:
5619
diff
changeset
|
1489 + (hscroll ? 1 - hscroll : 0), |
3317
55066d2375b6
(buffer_posn_from_coords): Since COL is already
Richard M. Stallman <rms@gnu.org>
parents:
3192
diff
changeset
|
1490 ZV, line, col, |
6692
43a79400a664
Add window argument on calls to compute_motion.
Karl Heuer <kwzh@gnu.org>
parents:
6682
diff
changeset
|
1491 window_width, hscroll, 0, window); |
314 | 1492 |
1493 current_buffer = old_current_buffer; | |
1494 | |
764 | 1495 /* compute_motion considers frame points past the end of a line |
493 | 1496 to be *after* the newline, i.e. at the start of the next line. |
1497 This is reasonable, but not really what we want. So if the | |
1498 result is on a line below LINE, back it up one character. */ | |
1499 if (posn->vpos > line) | |
1500 return posn->bufpos - 1; | |
1501 else | |
1502 return posn->bufpos; | |
314 | 1503 } |
1504 | |
1505 static int | |
1506 count_blanks (r) | |
1507 register GLYPH *r; | |
1508 { | |
1509 register GLYPH *p = r; | |
1495
f17665e7347e
(count_blanks): Leave argument r constant, and increment p.
Richard M. Stallman <rms@gnu.org>
parents:
1407
diff
changeset
|
1510 while (*p++ == SPACEGLYPH); |
f17665e7347e
(count_blanks): Leave argument r constant, and increment p.
Richard M. Stallman <rms@gnu.org>
parents:
1407
diff
changeset
|
1511 return p - r - 1; |
314 | 1512 } |
1513 | |
1514 static int | |
1515 count_match (str1, str2) | |
1516 GLYPH *str1, *str2; | |
1517 { | |
1518 register GLYPH *p1 = str1; | |
1519 register GLYPH *p2 = str2; | |
1520 while (*p1++ == *p2++); | |
1521 return p1 - str1 - 1; | |
1522 } | |
1523 | |
1524 /* Char insertion/deletion cost vector, from term.c */ | |
1525 extern int *char_ins_del_vector; | |
1526 | |
1849
23ab36427257
(char_ins_del_cost): Use FRAME_WIDTH, not FRAME_HEIGHT.
Richard M. Stallman <rms@gnu.org>
parents:
1821
diff
changeset
|
1527 #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_WIDTH((f))]) |
314 | 1528 |
1529 static void | |
764 | 1530 update_line (frame, vpos) |
1531 register FRAME_PTR frame; | |
314 | 1532 int vpos; |
1533 { | |
1534 register GLYPH *obody, *nbody, *op1, *op2, *np1, *temp; | |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1535 int *temp1; |
314 | 1536 int tem; |
1537 int osp, nsp, begmatch, endmatch, olen, nlen; | |
1538 int save; | |
764 | 1539 register struct frame_glyphs *current_frame |
1540 = FRAME_CURRENT_GLYPHS (frame); | |
1541 register struct frame_glyphs *desired_frame | |
1542 = FRAME_DESIRED_GLYPHS (frame); | |
314 | 1543 |
764 | 1544 if (desired_frame->highlight[vpos] |
1545 != (current_frame->enable[vpos] && current_frame->highlight[vpos])) | |
314 | 1546 { |
764 | 1547 change_line_highlight (desired_frame->highlight[vpos], vpos, |
1548 (current_frame->enable[vpos] ? | |
1549 current_frame->used[vpos] : 0)); | |
1550 current_frame->enable[vpos] = 0; | |
314 | 1551 } |
1552 else | |
764 | 1553 reassert_line_highlight (desired_frame->highlight[vpos], vpos); |
314 | 1554 |
764 | 1555 if (! current_frame->enable[vpos]) |
314 | 1556 { |
1557 olen = 0; | |
1558 } | |
1559 else | |
1560 { | |
764 | 1561 obody = current_frame->glyphs[vpos]; |
1562 olen = current_frame->used[vpos]; | |
1563 if (! current_frame->highlight[vpos]) | |
314 | 1564 { |
1565 if (!must_write_spaces) | |
1566 while (obody[olen - 1] == SPACEGLYPH && olen > 0) | |
1567 olen--; | |
1568 } | |
1569 else | |
1570 { | |
1571 /* For an inverse-video line, remember we gave it | |
764 | 1572 spaces all the way to the frame edge |
314 | 1573 so that the reverse video extends all the way across. */ |
1574 | |
764 | 1575 while (olen < FRAME_WIDTH (frame) - 1) |
314 | 1576 obody[olen++] = SPACEGLYPH; |
1577 } | |
1578 } | |
1579 | |
1580 /* One way or another, this will enable the line being updated. */ | |
764 | 1581 current_frame->enable[vpos] = 1; |
1582 current_frame->used[vpos] = desired_frame->used[vpos]; | |
1583 current_frame->highlight[vpos] = desired_frame->highlight[vpos]; | |
1584 current_frame->bufp[vpos] = desired_frame->bufp[vpos]; | |
314 | 1585 |
1586 #ifdef HAVE_X_WINDOWS | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
1587 if (FRAME_X_P (frame)) |
314 | 1588 { |
764 | 1589 current_frame->pix_width[vpos] |
1590 = current_frame->used[vpos] | |
1591 * FONT_WIDTH (frame->display.x->font); | |
1592 current_frame->pix_height[vpos] | |
6765
9be1670e9032
(update_line): Use line_height field.
Richard M. Stallman <rms@gnu.org>
parents:
6692
diff
changeset
|
1593 = frame->display.x->line_height; |
314 | 1594 } |
1595 #endif /* HAVE_X_WINDOWS */ | |
1596 | |
764 | 1597 if (!desired_frame->enable[vpos]) |
314 | 1598 { |
1599 nlen = 0; | |
1600 goto just_erase; | |
1601 } | |
1602 | |
764 | 1603 nbody = desired_frame->glyphs[vpos]; |
1604 nlen = desired_frame->used[vpos]; | |
314 | 1605 |
1606 /* Pretend trailing spaces are not there at all, | |
1607 unless for one reason or another we must write all spaces. */ | |
764 | 1608 if (! desired_frame->highlight[vpos]) |
314 | 1609 { |
1610 if (!must_write_spaces) | |
1611 /* We know that the previous character byte contains 0. */ | |
1612 while (nbody[nlen - 1] == SPACEGLYPH) | |
1613 nlen--; | |
1614 } | |
1615 else | |
1616 { | |
1617 /* For an inverse-video line, give it extra trailing spaces | |
764 | 1618 all the way to the frame edge |
314 | 1619 so that the reverse video extends all the way across. */ |
1620 | |
764 | 1621 while (nlen < FRAME_WIDTH (frame) - 1) |
314 | 1622 nbody[nlen++] = SPACEGLYPH; |
1623 } | |
1624 | |
1625 /* If there's no i/d char, quickly do the best we can without it. */ | |
1626 if (!char_ins_del_ok) | |
1627 { | |
1628 int i,j; | |
1629 | |
4276
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1630 #if 0 |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1631 if (FRAME_X_P (frame)) |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1632 { |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1633 /* Under X, erase everything we are going to rewrite, |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1634 and rewrite everything from the first char that's changed. |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1635 This is part of supporting fonts like Courier |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1636 whose chars can overlap outside the char width. */ |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1637 for (i = 0; i < nlen; i++) |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1638 if (i >= olen || nbody[i] != obody[i]) |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1639 break; |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1640 |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1641 cursor_to (vpos, i); |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1642 if (i != olen) |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1643 clear_end_of_line (olen); |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1644 write_glyphs (nbody + i, nlen - i); |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1645 } |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1646 else |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1647 {} |
2298d2aff61c
Commented-out code added.
Richard M. Stallman <rms@gnu.org>
parents:
4134
diff
changeset
|
1648 #endif /* 0 */ |
314 | 1649 for (i = 0; i < nlen; i++) |
1650 { | |
1651 if (i >= olen || nbody[i] != obody[i]) /* A non-matching char. */ | |
1652 { | |
1653 cursor_to (vpos, i); | |
1654 for (j = 1; (i + j < nlen && | |
1655 (i + j >= olen || nbody[i+j] != obody[i+j])); | |
1656 j++); | |
1657 | |
1658 /* Output this run of non-matching chars. */ | |
1659 write_glyphs (nbody + i, j); | |
1660 i += j - 1; | |
1661 | |
1662 /* Now find the next non-match. */ | |
1663 } | |
1664 } | |
1665 | |
1666 /* Clear the rest of the line, or the non-clear part of it. */ | |
1667 if (olen > nlen) | |
1668 { | |
1669 cursor_to (vpos, nlen); | |
1670 clear_end_of_line (olen); | |
1671 } | |
1672 | |
764 | 1673 /* Exchange contents between current_frame and new_frame. */ |
1674 temp = desired_frame->glyphs[vpos]; | |
1675 desired_frame->glyphs[vpos] = current_frame->glyphs[vpos]; | |
1676 current_frame->glyphs[vpos] = temp; | |
314 | 1677 |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1678 /* Exchange charstarts between current_frame and new_frame. */ |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1679 temp1 = desired_frame->charstarts[vpos]; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1680 desired_frame->charstarts[vpos] = current_frame->charstarts[vpos]; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1681 current_frame->charstarts[vpos] = temp1; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1682 |
314 | 1683 return; |
1684 } | |
1685 | |
1686 if (!olen) | |
1687 { | |
764 | 1688 nsp = (must_write_spaces || desired_frame->highlight[vpos]) |
314 | 1689 ? 0 : count_blanks (nbody); |
1690 if (nlen > nsp) | |
1691 { | |
1692 cursor_to (vpos, nsp); | |
1693 write_glyphs (nbody + nsp, nlen - nsp); | |
1694 } | |
1695 | |
764 | 1696 /* Exchange contents between current_frame and new_frame. */ |
1697 temp = desired_frame->glyphs[vpos]; | |
1698 desired_frame->glyphs[vpos] = current_frame->glyphs[vpos]; | |
1699 current_frame->glyphs[vpos] = temp; | |
314 | 1700 |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1701 /* Exchange charstarts between current_frame and new_frame. */ |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1702 temp1 = desired_frame->charstarts[vpos]; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1703 desired_frame->charstarts[vpos] = current_frame->charstarts[vpos]; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1704 current_frame->charstarts[vpos] = temp1; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1705 |
314 | 1706 return; |
1707 } | |
1708 | |
1709 obody[olen] = 1; | |
1710 save = nbody[nlen]; | |
1711 nbody[nlen] = 0; | |
1712 | |
1713 /* Compute number of leading blanks in old and new contents. */ | |
1714 osp = count_blanks (obody); | |
764 | 1715 if (!desired_frame->highlight[vpos]) |
314 | 1716 nsp = count_blanks (nbody); |
1717 else | |
1718 nsp = 0; | |
1719 | |
1720 /* Compute number of matching chars starting with first nonblank. */ | |
1721 begmatch = count_match (obody + osp, nbody + nsp); | |
1722 | |
1723 /* Spaces in new match implicit space past the end of old. */ | |
1724 /* A bug causing this to be a no-op was fixed in 18.29. */ | |
1725 if (!must_write_spaces && osp + begmatch == olen) | |
1726 { | |
1727 np1 = nbody + nsp; | |
1728 while (np1[begmatch] == SPACEGLYPH) | |
1729 begmatch++; | |
1730 } | |
1731 | |
1732 /* Avoid doing insert/delete char | |
1733 just cause number of leading spaces differs | |
1734 when the following text does not match. */ | |
1735 if (begmatch == 0 && osp != nsp) | |
1736 osp = nsp = min (osp, nsp); | |
1737 | |
1738 /* Find matching characters at end of line */ | |
1739 op1 = obody + olen; | |
1740 np1 = nbody + nlen; | |
1741 op2 = op1 + begmatch - min (olen - osp, nlen - nsp); | |
1742 while (op1 > op2 && op1[-1] == np1[-1]) | |
1743 { | |
1744 op1--; | |
1745 np1--; | |
1746 } | |
1747 endmatch = obody + olen - op1; | |
1748 | |
1749 /* Put correct value back in nbody[nlen]. | |
1750 This is important because direct_output_for_insert | |
1751 can write into the line at a later point. | |
1752 If this screws up the zero at the end of the line, re-establish it. */ | |
1753 nbody[nlen] = save; | |
1754 obody[olen] = 0; | |
1755 | |
1756 /* tem gets the distance to insert or delete. | |
1757 endmatch is how many characters we save by doing so. | |
1758 Is it worth it? */ | |
1759 | |
1760 tem = (nlen - nsp) - (olen - osp); | |
1761 if (endmatch && tem | |
764 | 1762 && (!char_ins_del_ok || endmatch <= char_ins_del_cost (frame)[tem])) |
314 | 1763 endmatch = 0; |
1764 | |
1765 /* nsp - osp is the distance to insert or delete. | |
1766 If that is nonzero, begmatch is known to be nonzero also. | |
1767 begmatch + endmatch is how much we save by doing the ins/del. | |
1768 Is it worth it? */ | |
1769 | |
1770 if (nsp != osp | |
1771 && (!char_ins_del_ok | |
764 | 1772 || begmatch + endmatch <= char_ins_del_cost (frame)[nsp - osp])) |
314 | 1773 { |
1774 begmatch = 0; | |
1775 endmatch = 0; | |
1776 osp = nsp = min (osp, nsp); | |
1777 } | |
1778 | |
1779 /* Now go through the line, inserting, writing and | |
1780 deleting as appropriate. */ | |
1781 | |
1782 if (osp > nsp) | |
1783 { | |
1784 cursor_to (vpos, nsp); | |
1785 delete_glyphs (osp - nsp); | |
1786 } | |
1787 else if (nsp > osp) | |
1788 { | |
1789 /* If going to delete chars later in line | |
1790 and insert earlier in the line, | |
1791 must delete first to avoid losing data in the insert */ | |
1792 if (endmatch && nlen < olen + nsp - osp) | |
1793 { | |
1794 cursor_to (vpos, nlen - endmatch + osp - nsp); | |
1795 delete_glyphs (olen + nsp - osp - nlen); | |
1796 olen = nlen - (nsp - osp); | |
1797 } | |
1798 cursor_to (vpos, osp); | |
1799 insert_glyphs ((char *)0, nsp - osp); | |
1800 } | |
1801 olen += nsp - osp; | |
1802 | |
1803 tem = nsp + begmatch + endmatch; | |
1804 if (nlen != tem || olen != tem) | |
1805 { | |
1806 cursor_to (vpos, nsp + begmatch); | |
1807 if (!endmatch || nlen == olen) | |
1808 { | |
1809 /* If new text being written reaches right margin, | |
1810 there is no need to do clear-to-eol at the end. | |
1811 (and it would not be safe, since cursor is not | |
1812 going to be "at the margin" after the text is done) */ | |
764 | 1813 if (nlen == FRAME_WIDTH (frame)) |
314 | 1814 olen = 0; |
1815 write_glyphs (nbody + nsp + begmatch, nlen - tem); | |
1816 | |
1817 #ifdef obsolete | |
1818 | |
1819 /* the following code loses disastrously if tem == nlen. | |
1820 Rather than trying to fix that case, I am trying the simpler | |
1821 solution found above. */ | |
1822 | |
1823 /* If the text reaches to the right margin, | |
1824 it will lose one way or another (depending on AutoWrap) | |
1825 to clear to end of line after outputting all the text. | |
1826 So pause with one character to go and clear the line then. */ | |
764 | 1827 if (nlen == FRAME_WIDTH (frame) && fast_clear_end_of_line && olen > nlen) |
314 | 1828 { |
1829 /* endmatch must be zero, and tem must equal nsp + begmatch */ | |
1830 write_glyphs (nbody + tem, nlen - tem - 1); | |
1831 clear_end_of_line (olen); | |
1832 olen = 0; /* Don't let it be cleared again later */ | |
1833 write_glyphs (nbody + nlen - 1, 1); | |
1834 } | |
1835 else | |
1836 write_glyphs (nbody + nsp + begmatch, nlen - tem); | |
1837 #endif /* OBSOLETE */ | |
1838 | |
1839 } | |
1840 else if (nlen > olen) | |
1841 { | |
1842 write_glyphs (nbody + nsp + begmatch, olen - tem); | |
1843 insert_glyphs (nbody + nsp + begmatch + olen - tem, nlen - olen); | |
1844 olen = nlen; | |
1845 } | |
1846 else if (olen > nlen) | |
1847 { | |
1848 write_glyphs (nbody + nsp + begmatch, nlen - tem); | |
1849 delete_glyphs (olen - nlen); | |
1850 olen = nlen; | |
1851 } | |
1852 } | |
1853 | |
1854 just_erase: | |
1855 /* If any unerased characters remain after the new line, erase them. */ | |
1856 if (olen > nlen) | |
1857 { | |
1858 cursor_to (vpos, nlen); | |
1859 clear_end_of_line (olen); | |
1860 } | |
1861 | |
764 | 1862 /* Exchange contents between current_frame and new_frame. */ |
1863 temp = desired_frame->glyphs[vpos]; | |
1864 desired_frame->glyphs[vpos] = current_frame->glyphs[vpos]; | |
1865 current_frame->glyphs[vpos] = temp; | |
6617
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1866 |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1867 /* Exchange charstarts between current_frame and new_frame. */ |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1868 temp1 = desired_frame->charstarts[vpos]; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1869 desired_frame->charstarts[vpos] = current_frame->charstarts[vpos]; |
6309d97ee4bc
(scroll_frame_lines): Handle charstarts like glyphs.
Richard M. Stallman <rms@gnu.org>
parents:
6414
diff
changeset
|
1870 current_frame->charstarts[vpos] = temp1; |
314 | 1871 } |
1872 | |
7814
e1e536773850
(Fframe_or_buffer_changed_p): Reuse the state vector.
Karl Heuer <kwzh@gnu.org>
parents:
7810
diff
changeset
|
1873 /* A vector of size >= NFRAMES + 3 * NBUFFERS + 1, containing the session's |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1874 frames, buffers, buffer-read-only flags, and buffer-modified-flags, |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1875 and a trailing sentinel (so we don't need to add length checks). */ |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1876 static Lisp_Object frame_and_buffer_state; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1877 |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1878 DEFUN ("frame-or-buffer-changed-p", Fframe_or_buffer_changed_p, |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1879 Sframe_or_buffer_changed_p, 0, 0, 0, |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1880 "Return non-nil if the frame and buffer state appears to have changed.\n\ |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1881 The state variable is an internal vector containing all frames and buffers,\n\ |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1882 along with the buffers' read-only and modified flags, which allows a fast\n\ |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1883 check to see whether the menu bars might need to be recomputed.\n\ |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1884 If this function returns non-nil, it updates the internal vector to reflect\n\ |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1885 the current state.\n") |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1886 () |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1887 { |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1888 Lisp_Object tail, frame, buf; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1889 Lisp_Object *vecp; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1890 int n; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1891 vecp = XVECTOR (frame_and_buffer_state)->contents; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1892 FOR_EACH_FRAME (tail, frame) |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1893 if (!EQ (*vecp++, frame)) |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1894 goto changed; |
9650
4295137050dd
(Fframe_or_buffer_changed_p):
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1895 /* Check that the buffer info matches. |
4295137050dd
(Fframe_or_buffer_changed_p):
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1896 No need to test for the end of the vector |
4295137050dd
(Fframe_or_buffer_changed_p):
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1897 because the last element of the vector is lambda |
4295137050dd
(Fframe_or_buffer_changed_p):
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1898 and that will always cause a mismatch. */ |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1899 for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr) |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1900 { |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1901 buf = XCONS (XCONS (tail)->car)->cdr; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1902 if (!EQ (*vecp++, buf)) |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1903 goto changed; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1904 if (!EQ (*vecp++, XBUFFER (buf)->read_only)) |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1905 goto changed; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1906 if (!EQ (*vecp++, Fbuffer_modified_p (buf))) |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1907 goto changed; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1908 } |
9650
4295137050dd
(Fframe_or_buffer_changed_p):
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1909 /* Detect deletion of a buffer at the end of the list. */ |
4295137050dd
(Fframe_or_buffer_changed_p):
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1910 if (*vecp == Qlambda) |
4295137050dd
(Fframe_or_buffer_changed_p):
Richard M. Stallman <rms@gnu.org>
parents:
9572
diff
changeset
|
1911 return Qnil; |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1912 changed: |
9963 | 1913 /* Start with 1 so there is room for at least one lambda at the end. */ |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1914 n = 1; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1915 FOR_EACH_FRAME (tail, frame) |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1916 n++; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1917 for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr) |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1918 n += 3; |
7814
e1e536773850
(Fframe_or_buffer_changed_p): Reuse the state vector.
Karl Heuer <kwzh@gnu.org>
parents:
7810
diff
changeset
|
1919 /* Reallocate the vector if it's grown, or if it's shrunk a lot. */ |
e1e536773850
(Fframe_or_buffer_changed_p): Reuse the state vector.
Karl Heuer <kwzh@gnu.org>
parents:
7810
diff
changeset
|
1920 if (n > XVECTOR (frame_and_buffer_state)->size |
e1e536773850
(Fframe_or_buffer_changed_p): Reuse the state vector.
Karl Heuer <kwzh@gnu.org>
parents:
7810
diff
changeset
|
1921 || n < XVECTOR (frame_and_buffer_state)->size / 2) |
e1e536773850
(Fframe_or_buffer_changed_p): Reuse the state vector.
Karl Heuer <kwzh@gnu.org>
parents:
7810
diff
changeset
|
1922 frame_and_buffer_state = Fmake_vector (make_number (n), Qlambda); |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1923 vecp = XVECTOR (frame_and_buffer_state)->contents; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1924 FOR_EACH_FRAME (tail, frame) |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1925 *vecp++ = frame; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1926 for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr) |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1927 { |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1928 buf = XCONS (XCONS (tail)->car)->cdr; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1929 *vecp++ = buf; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1930 *vecp++ = XBUFFER (buf)->read_only; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1931 *vecp++ = Fbuffer_modified_p (buf); |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1932 } |
7814
e1e536773850
(Fframe_or_buffer_changed_p): Reuse the state vector.
Karl Heuer <kwzh@gnu.org>
parents:
7810
diff
changeset
|
1933 /* If we left any slack in the vector, fill it up now. */ |
e1e536773850
(Fframe_or_buffer_changed_p): Reuse the state vector.
Karl Heuer <kwzh@gnu.org>
parents:
7810
diff
changeset
|
1934 for (; n < XVECTOR (frame_and_buffer_state)->size; ++n) |
e1e536773850
(Fframe_or_buffer_changed_p): Reuse the state vector.
Karl Heuer <kwzh@gnu.org>
parents:
7810
diff
changeset
|
1935 *vecp++ = Qlambda; |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1936 return Qt; |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1937 } |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
1938 |
314 | 1939 DEFUN ("open-termscript", Fopen_termscript, Sopen_termscript, |
1940 1, 1, "FOpen termscript file: ", | |
1941 "Start writing all terminal output to FILE as well as the terminal.\n\ | |
1942 FILE = nil means just close any termscript file currently open.") | |
1943 (file) | |
1944 Lisp_Object file; | |
1945 { | |
1946 if (termscript != 0) fclose (termscript); | |
1947 termscript = 0; | |
1948 | |
493 | 1949 if (! NILP (file)) |
314 | 1950 { |
1951 file = Fexpand_file_name (file, Qnil); | |
1952 termscript = fopen (XSTRING (file)->data, "w"); | |
1953 if (termscript == 0) | |
1954 report_file_error ("Opening termscript", Fcons (file, Qnil)); | |
1955 } | |
1956 return Qnil; | |
1957 } | |
1958 | |
1959 | |
1960 #ifdef SIGWINCH | |
493 | 1961 SIGTYPE |
314 | 1962 window_change_signal () |
1963 { | |
1964 int width, height; | |
1965 extern int errno; | |
1966 int old_errno = errno; | |
1967 | |
764 | 1968 get_frame_size (&width, &height); |
314 | 1969 |
764 | 1970 /* The frame size change obviously applies to a termcap-controlled |
1971 frame. Find such a frame in the list, and assume it's the only | |
314 | 1972 one (since the redisplay code always writes to stdout, not a |
764 | 1973 FILE * specified in the frame structure). Record the new size, |
314 | 1974 but don't reallocate the data structures now. Let that be done |
1975 later outside of the signal handler. */ | |
1976 | |
1977 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
1978 Lisp_Object tail, frame; |
314 | 1979 |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
1980 FOR_EACH_FRAME (tail, frame) |
314 | 1981 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
1982 if (FRAME_TERMCAP_P (XFRAME (frame))) |
314 | 1983 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
1984 change_frame_size (XFRAME (frame), height, width, 0, 1); |
314 | 1985 break; |
1986 } | |
1987 } | |
1988 } | |
1989 | |
1990 signal (SIGWINCH, window_change_signal); | |
1991 errno = old_errno; | |
1992 } | |
1993 #endif /* SIGWINCH */ | |
1994 | |
1995 | |
764 | 1996 /* Do any change in frame size that was requested by a signal. */ |
314 | 1997 |
1998 do_pending_window_change () | |
1999 { | |
2000 /* If window_change_signal should have run before, run it now. */ | |
2001 while (delayed_size_change) | |
2002 { | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
2003 Lisp_Object tail, frame; |
314 | 2004 |
2005 delayed_size_change = 0; | |
2006 | |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
2007 FOR_EACH_FRAME (tail, frame) |
314 | 2008 { |
2252
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
2009 FRAME_PTR f = XFRAME (frame); |
9793d8654e23
* frame.h (FOR_EACH_FRAME): Change the definition so that
Jim Blandy <jimb@redhat.com>
parents:
2198
diff
changeset
|
2010 |
764 | 2011 int height = FRAME_NEW_HEIGHT (f); |
2012 int width = FRAME_NEW_WIDTH (f); | |
314 | 2013 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
2014 if (height != 0 || width != 0) |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2015 change_frame_size (f, height, width, 0, 0); |
314 | 2016 } |
2017 } | |
2018 } | |
2019 | |
2020 | |
764 | 2021 /* Change the frame height and/or width. Values may be given as zero to |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2022 indicate no change is to take place. |
314 | 2023 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2024 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
|
2025 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
|
2026 redisplay. Since this tries to resize windows, we can't call it |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2027 from a signal handler. */ |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2028 |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2029 change_frame_size (frame, newheight, newwidth, pretend, delay) |
764 | 2030 register FRAME_PTR frame; |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2031 int newheight, newwidth, pretend; |
314 | 2032 { |
2033 /* If we can't deal with the change now, queue it for later. */ | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2034 if (delay) |
314 | 2035 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2036 FRAME_NEW_HEIGHT (frame) = newheight; |
764 | 2037 FRAME_NEW_WIDTH (frame) = newwidth; |
314 | 2038 delayed_size_change = 1; |
2039 return; | |
2040 } | |
2041 | |
764 | 2042 /* This size-change overrides any pending one for this frame. */ |
2043 FRAME_NEW_HEIGHT (frame) = 0; | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2044 FRAME_NEW_WIDTH (frame) = 0; |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2045 |
3449
ad455da9b789
(do_pending_window_change): No need to clear
Richard M. Stallman <rms@gnu.org>
parents:
3357
diff
changeset
|
2046 /* If an argument is zero, set it to the current value. */ |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2047 newheight || (newheight = FRAME_HEIGHT (frame)); |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2048 newwidth || (newwidth = FRAME_WIDTH (frame)); |
314 | 2049 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2050 /* Round up to the smallest acceptable size. */ |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2051 check_frame_size (frame, &newheight, &newwidth); |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2052 |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2053 /* If we're not changing the frame size, quit now. */ |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2054 if (newheight == FRAME_HEIGHT (frame) |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2055 && newwidth == FRAME_WIDTH (frame)) |
314 | 2056 return; |
2057 | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2058 if (newheight != FRAME_HEIGHT (frame)) |
314 | 2059 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2060 if (FRAME_HAS_MINIBUF_P (frame) |
764 | 2061 && ! FRAME_MINIBUF_ONLY_P (frame)) |
314 | 2062 { |
764 | 2063 /* Frame has both root and minibuffer. */ |
2064 set_window_height (FRAME_ROOT_WINDOW (frame), | |
2132
0f4b18efebf5
(change_frame_size): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
1915
diff
changeset
|
2065 newheight - 1 - FRAME_MENU_BAR_LINES (frame), 0); |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
2066 XSETFASTINT (XWINDOW (FRAME_MINIBUF_WINDOW (frame))->top, |
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
2067 newheight - 1); |
764 | 2068 set_window_height (FRAME_MINIBUF_WINDOW (frame), 1, 0); |
314 | 2069 } |
2070 else | |
764 | 2071 /* Frame has just one top-level window. */ |
2132
0f4b18efebf5
(change_frame_size): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
1915
diff
changeset
|
2072 set_window_height (FRAME_ROOT_WINDOW (frame), |
0f4b18efebf5
(change_frame_size): Handle FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents:
1915
diff
changeset
|
2073 newheight - FRAME_MENU_BAR_LINES (frame), 0); |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2074 |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2075 if (FRAME_TERMCAP_P (frame) && !pretend) |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2076 FrameRows = newheight; |
314 | 2077 |
2078 #if 0 | |
764 | 2079 if (frame->output_method == output_termcap) |
314 | 2080 { |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2081 frame_height = newheight; |
314 | 2082 if (!pretend) |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2083 FrameRows = newheight; |
314 | 2084 } |
2085 #endif | |
2086 } | |
2087 | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2088 if (newwidth != FRAME_WIDTH (frame)) |
314 | 2089 { |
764 | 2090 set_window_width (FRAME_ROOT_WINDOW (frame), newwidth, 0); |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2091 if (FRAME_HAS_MINIBUF_P (frame)) |
764 | 2092 set_window_width (FRAME_MINIBUF_WINDOW (frame), newwidth, 0); |
314 | 2093 |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2094 if (FRAME_TERMCAP_P (frame) && !pretend) |
764 | 2095 FrameCols = newwidth; |
314 | 2096 #if 0 |
764 | 2097 if (frame->output_method == output_termcap) |
314 | 2098 { |
764 | 2099 frame_width = newwidth; |
314 | 2100 if (!pretend) |
764 | 2101 FrameCols = newwidth; |
314 | 2102 } |
2103 #endif | |
2104 } | |
2105 | |
960
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2106 FRAME_HEIGHT (frame) = newheight; |
17986889d3b6
* dispnew.c (Fredraw_frame): Call clear_frame_records before
Jim Blandy <jimb@redhat.com>
parents:
764
diff
changeset
|
2107 FRAME_WIDTH (frame) = newwidth; |
7648
2e85e48d42da
(change_frame_size): Keep cursor coords in range.
Richard M. Stallman <rms@gnu.org>
parents:
7558
diff
changeset
|
2108 |
2e85e48d42da
(change_frame_size): Keep cursor coords in range.
Richard M. Stallman <rms@gnu.org>
parents:
7558
diff
changeset
|
2109 if (FRAME_CURSOR_X (frame) >= FRAME_WIDTH (frame)) |
2e85e48d42da
(change_frame_size): Keep cursor coords in range.
Richard M. Stallman <rms@gnu.org>
parents:
7558
diff
changeset
|
2110 FRAME_CURSOR_X (frame) = FRAME_WIDTH (frame) - 1; |
2e85e48d42da
(change_frame_size): Keep cursor coords in range.
Richard M. Stallman <rms@gnu.org>
parents:
7558
diff
changeset
|
2111 if (FRAME_CURSOR_Y (frame) >= FRAME_HEIGHT (frame)) |
2e85e48d42da
(change_frame_size): Keep cursor coords in range.
Richard M. Stallman <rms@gnu.org>
parents:
7558
diff
changeset
|
2112 FRAME_CURSOR_Y (frame) = FRAME_HEIGHT (frame) - 1; |
2e85e48d42da
(change_frame_size): Keep cursor coords in range.
Richard M. Stallman <rms@gnu.org>
parents:
7558
diff
changeset
|
2113 |
764 | 2114 remake_frame_glyphs (frame); |
2115 calculate_costs (frame); | |
314 | 2116 } |
2117 | |
2118 DEFUN ("send-string-to-terminal", Fsend_string_to_terminal, | |
2119 Ssend_string_to_terminal, 1, 1, 0, | |
2120 "Send STRING to the terminal without alteration.\n\ | |
2121 Control characters in STRING will have terminal-dependent effects.") | |
2122 (str) | |
2123 Lisp_Object str; | |
2124 { | |
2125 CHECK_STRING (str, 0); | |
2126 fwrite (XSTRING (str)->data, 1, XSTRING (str)->size, stdout); | |
2127 fflush (stdout); | |
2128 if (termscript) | |
2129 { | |
2130 fwrite (XSTRING (str)->data, 1, XSTRING (str)->size, termscript); | |
2131 fflush (termscript); | |
2132 } | |
2133 return Qnil; | |
2134 } | |
2135 | |
2136 DEFUN ("ding", Fding, Sding, 0, 1, 0, | |
2137 "Beep, or flash the screen.\n\ | |
2138 Also, unless an argument is given,\n\ | |
2139 terminate any keyboard macro currently executing.") | |
2140 (arg) | |
2141 Lisp_Object arg; | |
2142 { | |
493 | 2143 if (!NILP (arg)) |
314 | 2144 { |
649
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
2145 if (noninteractive) |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
2146 putchar (07); |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
2147 else |
61deba7b73b6
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
587
diff
changeset
|
2148 ring_bell (); |
314 | 2149 fflush (stdout); |
2150 } | |
2151 else | |
2152 bitch_at_user (); | |
2153 | |
2154 return Qnil; | |
2155 } | |
2156 | |
2157 bitch_at_user () | |
2158 { | |
2159 if (noninteractive) | |
2160 putchar (07); | |
2161 else if (!INTERACTIVE) /* Stop executing a keyboard macro. */ | |
2162 error ("Keyboard macro terminated by a command ringing the bell"); | |
2163 else | |
2164 ring_bell (); | |
2165 fflush (stdout); | |
2166 } | |
2167 | |
2168 DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0, | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2169 "Pause, without updating display, for SECONDS seconds.\n\ |
2648 | 2170 SECONDS may be a floating-point value, meaning that you can wait for a\n\ |
2171 fraction of a second. Optional second arg MILLISECONDS specifies an\n\ | |
2172 additional wait period, in milliseconds; this may be useful if your\n\ | |
2173 Emacs was built without floating point support.\n\ | |
2174 \(Not all operating systems support waiting for a fraction of a second.)") | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2175 (seconds, milliseconds) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2176 Lisp_Object seconds, milliseconds; |
314 | 2177 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2178 int sec, usec; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2179 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2180 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
|
2181 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
|
2182 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2183 CHECK_NUMBER (milliseconds, 1); |
2648 | 2184 usec = XINT (milliseconds) * 1000; |
2185 | |
2186 #ifdef LISP_FLOAT_TYPE | |
2187 { | |
2188 double duration = extract_float (seconds); | |
2189 sec = (int) duration; | |
2190 usec += (duration - sec) * 1000000; | |
2191 } | |
2192 #else | |
2193 CHECK_NUMBER (seconds, 0); | |
2194 sec = XINT (seconds); | |
2195 #endif | |
314 | 2196 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2197 #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
|
2198 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
|
2199 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
|
2200 #endif |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2201 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2202 /* 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
|
2203 if (usec < 0) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2204 { |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2205 /* We can't rely on the rounding being correct if user is negative. */ |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2206 if (-1000000 < usec) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2207 sec--, usec += 1000000; |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2208 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2209 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
|
2210 } |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2211 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2212 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
|
2213 |
4290
885452da2a8f
(Fsleep_for): If arg is 0, return right away.
Richard M. Stallman <rms@gnu.org>
parents:
4276
diff
changeset
|
2214 if (sec <= 0) |
314 | 2215 return Qnil; |
2216 | |
650 | 2217 { |
2218 Lisp_Object zero; | |
2219 | |
9303
3115ae493c30
(direct_output_for_insert, direct_output_forward_char, change_frame_size,
Karl Heuer <kwzh@gnu.org>
parents:
9264
diff
changeset
|
2220 XSETFASTINT (zero, 0); |
650 | 2221 wait_reading_process_input (sec, usec, zero, 0); |
2222 } | |
587 | 2223 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2224 /* 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
|
2225 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
|
2226 #if 0 |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2227 /* No wait_reading_process_input */ |
314 | 2228 immediate_quit = 1; |
2229 QUIT; | |
2230 | |
2231 #ifdef VMS | |
2232 sys_sleep (sec); | |
2233 #else /* not VMS */ | |
2234 /* The reason this is done this way | |
2235 (rather than defined (H_S) && defined (H_T)) | |
2236 is because the VMS preprocessor doesn't grok `defined' */ | |
2237 #ifdef HAVE_SELECT | |
554 | 2238 EMACS_GET_TIME (end_time); |
2239 EMACS_SET_SECS_USECS (timeout, sec, usec); | |
587 | 2240 EMACS_ADD_TIME (end_time, end_time, timeout); |
554 | 2241 |
314 | 2242 while (1) |
2243 { | |
554 | 2244 EMACS_GET_TIME (timeout); |
2245 EMACS_SUB_TIME (timeout, end_time, timeout); | |
2246 if (EMACS_TIME_NEG_P (timeout) | |
2247 || !select (1, 0, 0, 0, &timeout)) | |
314 | 2248 break; |
2249 } | |
2250 #else /* not HAVE_SELECT */ | |
2251 sleep (sec); | |
2252 #endif /* HAVE_SELECT */ | |
2253 #endif /* not VMS */ | |
2254 | |
2255 immediate_quit = 0; | |
2256 #endif /* no subprocesses */ | |
2257 | |
2258 return Qnil; | |
2259 } | |
2260 | |
650 | 2261 /* This is just like wait_reading_process_input, except that |
2262 it does the redisplay. | |
2263 | |
5223
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
2264 It's also much like Fsit_for, except that it can be used for |
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
2265 waiting for input as well. One differnce is that sit_for |
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
2266 does not call prepare_menu_bars; Fsit_for does call that. */ |
650 | 2267 |
2268 Lisp_Object | |
2269 sit_for (sec, usec, reading, display) | |
2270 int sec, usec, reading, display; | |
314 | 2271 { |
650 | 2272 Lisp_Object read_kbd; |
314 | 2273 |
2274 if (detect_input_pending ()) | |
2275 return Qnil; | |
650 | 2276 |
2277 if (display) | |
314 | 2278 redisplay_preserve_echo_area (); |
2279 | |
673 | 2280 if (sec == 0 && usec == 0) |
2281 return Qt; | |
2282 | |
314 | 2283 #ifdef SIGIO |
1915
98ecf99d7b1a
* dispnew.c (sit_for): Pass the correct number of arguments to
Jim Blandy <jimb@redhat.com>
parents:
1872
diff
changeset
|
2284 gobble_input (0); |
650 | 2285 #endif |
2286 | |
9264
9338a124ea84
(redraw_frame, Fsleep_for, sit_for, Fsit_for): Use new accessor macros instead
Karl Heuer <kwzh@gnu.org>
parents:
8903
diff
changeset
|
2287 XSETINT (read_kbd, reading ? -1 : 1); |
650 | 2288 wait_reading_process_input (sec, usec, read_kbd, display); |
2289 | |
587 | 2290 |
2288
c6f3343edee1
Do * dispnew.c (sit_for): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2252
diff
changeset
|
2291 /* wait_reading_process_input should always be available now; it is |
c6f3343edee1
Do * dispnew.c (sit_for): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2252
diff
changeset
|
2292 simulated in a simple way on systems that don't support |
c6f3343edee1
Do * dispnew.c (sit_for): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2252
diff
changeset
|
2293 subprocesses. */ |
c6f3343edee1
Do * dispnew.c (sit_for): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2252
diff
changeset
|
2294 #if 0 |
c6f3343edee1
Do * dispnew.c (sit_for): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2252
diff
changeset
|
2295 /* No wait_reading_process_input available. */ |
314 | 2296 immediate_quit = 1; |
2297 QUIT; | |
2298 | |
2299 waitchannels = 1; | |
2300 #ifdef VMS | |
650 | 2301 input_wait_timeout (XINT (arg)); |
314 | 2302 #else /* not VMS */ |
587 | 2303 #ifndef HAVE_TIMEVAL |
2304 timeout_sec = sec; | |
2305 select (1, &waitchannels, 0, 0, &timeout_sec); | |
2306 #else /* HAVE_TIMEVAL */ | |
2307 timeout.tv_sec = sec; | |
2308 timeout.tv_usec = usec; | |
314 | 2309 select (1, &waitchannels, 0, 0, &timeout); |
587 | 2310 #endif /* HAVE_TIMEVAL */ |
314 | 2311 #endif /* not VMS */ |
2312 | |
2313 immediate_quit = 0; | |
587 | 2314 #endif |
314 | 2315 |
2316 return detect_input_pending () ? Qnil : Qt; | |
2317 } | |
2318 | |
650 | 2319 DEFUN ("sit-for", Fsit_for, Ssit_for, 1, 3, 0, |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2320 "Perform redisplay, then wait for SECONDS seconds or until input is available.\n\ |
2648 | 2321 SECONDS may be a floating-point value, meaning that you can wait for a\n\ |
2322 fraction of a second. Optional second arg MILLISECONDS specifies an\n\ | |
2323 additional wait period, in milliseconds; this may be useful if your\n\ | |
2324 Emacs was built without floating point support.\n\ | |
2325 \(Not all operating systems support waiting for a fraction of a second.)\n\ | |
650 | 2326 Optional third arg non-nil means don't redisplay, just wait for input.\n\ |
2327 Redisplay is preempted as always if input arrives, and does not happen\n\ | |
2328 if input is available before it starts.\n\ | |
2329 Value is t if waited the full time with no input arriving.") | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2330 (seconds, milliseconds, nodisp) |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2331 Lisp_Object seconds, milliseconds, nodisp; |
650 | 2332 { |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2333 int sec, usec; |
650 | 2334 |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2335 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
|
2336 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
|
2337 else |
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2338 CHECK_NUMBER (milliseconds, 1); |
2648 | 2339 usec = XINT (milliseconds) * 1000; |
2340 | |
2341 #ifdef LISP_FLOAT_TYPE | |
2342 { | |
2343 double duration = extract_float (seconds); | |
2344 sec = (int) duration; | |
2345 usec += (duration - sec) * 1000000; | |
2346 } | |
2347 #else | |
2348 CHECK_NUMBER (seconds, 0); | |
2349 sec = XINT (seconds); | |
2350 #endif | |
2291
bee5c1693cac
* dispnew.c (Fsleep_for): Make this take two arguments SECONDS and
Jim Blandy <jimb@redhat.com>
parents:
2288
diff
changeset
|
2351 |
650 | 2352 #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
|
2353 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
|
2354 error ("millisecond `sit-for' not supported on %s", SYSTEM_TYPE); |
650 | 2355 #endif |
2356 | |
5223
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
2357 if (NILP (nodisp)) |
db2e7e6a488e
(Fsit_for): Call prepare_menu_bars.
Richard M. Stallman <rms@gnu.org>
parents:
5218
diff
changeset
|
2358 prepare_menu_bars (); |
650 | 2359 return sit_for (sec, usec, 0, NILP (nodisp)); |
2360 } | |
314 | 2361 |
2362 char *terminal_type; | |
2363 | |
2364 /* Initialization done when Emacs fork is started, before doing stty. */ | |
2365 /* Determine terminal type and set terminal_driver */ | |
2366 /* Then invoke its decoding routine to set up variables | |
2367 in the terminal package */ | |
2368 | |
2369 init_display () | |
2370 { | |
2371 #ifdef HAVE_X_WINDOWS | |
2372 extern int display_arg; | |
2373 #endif | |
2374 | |
2375 meta_key = 0; | |
2376 inverse_video = 0; | |
2377 cursor_in_echo_area = 0; | |
2378 terminal_type = (char *) 0; | |
2379 | |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
2380 /* 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
|
2381 during startup. */ |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
2382 Vwindow_system = Qnil; |
314 | 2383 |
2339
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
2384 /* 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
|
2385 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
|
2386 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
|
2387 using the window system. |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
2388 |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
2389 If the DISPLAY environment variable is set, try to use X, and die |
a302de11debf
* dispnew.c (init_display): Initialize Vwindow_system.
Jim Blandy <jimb@redhat.com>
parents:
2292
diff
changeset
|
2390 with an error message if that doesn't work. */ |
314 | 2391 |
2392 #ifdef HAVE_X_WINDOWS | |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
2393 if (! display_arg) |
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
2394 { |
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
2395 #ifdef VMS |
2511
4fc5338ebb8f
* dispnew.c (getenv): Extern declaration deleted; this is done in
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
2396 display_arg = (getenv ("DECW$DISPLAY") != 0); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
2397 #else |
2511
4fc5338ebb8f
* dispnew.c (getenv): Extern declaration deleted; this is done in
Jim Blandy <jimb@redhat.com>
parents:
2439
diff
changeset
|
2398 display_arg = (getenv ("DISPLAY") != 0); |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
2399 #endif |
2364 | 2400 } |
2359
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
2401 |
90a5f91329f3
* dispnew.c (init_display): Get display name from environment
Jim Blandy <jimb@redhat.com>
parents:
2339
diff
changeset
|
2402 if (!inhibit_window_system && display_arg) |
314 | 2403 { |
2404 Vwindow_system = intern ("x"); | |
2405 #ifdef HAVE_X11 | |
2406 Vwindow_system_version = make_number (11); | |
2407 #else | |
2408 Vwindow_system_version = make_number (10); | |
2409 #endif | |
2410 return; | |
2411 } | |
2412 #endif /* HAVE_X_WINDOWS */ | |
2413 | |
2414 /* If no window system has been specified, try to use the terminal. */ | |
2415 if (! isatty (0)) | |
2416 { | |
2417 fprintf (stderr, "emacs: standard input is not a tty\n"); | |
2418 exit (1); | |
2419 } | |
2420 | |
2421 /* Look at the TERM variable */ | |
2422 terminal_type = (char *) getenv ("TERM"); | |
2423 if (!terminal_type) | |
2424 { | |
2425 #ifdef VMS | |
2426 fprintf (stderr, "Please specify your terminal type.\n\ | |
2427 For types defined in VMS, use set term /device=TYPE.\n\ | |
2428 For types not defined in VMS, use define emacs_term \"TYPE\".\n\ | |
2429 \(The quotation marks are necessary since terminal types are lower case.)\n"); | |
2430 #else | |
2431 fprintf (stderr, "Please set the environment variable TERM; see tset(1).\n"); | |
2432 #endif | |
2433 exit (1); | |
2434 } | |
2435 | |
2436 #ifdef VMS | |
2437 /* VMS DCL tends to upcase things, so downcase term type. | |
2438 Hardly any uppercase letters in terminal types; should be none. */ | |
2439 { | |
2440 char *new = (char *) xmalloc (strlen (terminal_type) + 1); | |
2441 char *p; | |
2442 | |
2443 strcpy (new, terminal_type); | |
2444 | |
2445 for (p = new; *p; p++) | |
2446 if (isupper (*p)) | |
2447 *p = tolower (*p); | |
2448 | |
2449 terminal_type = new; | |
2450 } | |
2451 #endif | |
2452 | |
2453 term_init (terminal_type); | |
2454 | |
764 | 2455 remake_frame_glyphs (selected_frame); |
2456 calculate_costs (selected_frame); | |
314 | 2457 |
2458 /* X and Y coordinates of the cursor between updates. */ | |
764 | 2459 FRAME_CURSOR_X (selected_frame) = 0; |
2460 FRAME_CURSOR_Y (selected_frame) = 0; | |
314 | 2461 |
2462 #ifdef SIGWINCH | |
2463 #ifndef CANNOT_DUMP | |
2464 if (initialized) | |
2465 #endif /* CANNOT_DUMP */ | |
2466 signal (SIGWINCH, window_change_signal); | |
2467 #endif /* SIGWINCH */ | |
2468 } | |
2469 | |
2470 syms_of_display () | |
2471 { | |
764 | 2472 #ifdef MULTI_FRAME |
2473 defsubr (&Sredraw_frame); | |
314 | 2474 #endif |
2475 defsubr (&Sredraw_display); | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
2476 defsubr (&Sframe_or_buffer_changed_p); |
314 | 2477 defsubr (&Sopen_termscript); |
2478 defsubr (&Sding); | |
2479 defsubr (&Ssit_for); | |
2480 defsubr (&Ssleep_for); | |
2481 defsubr (&Ssend_string_to_terminal); | |
2482 | |
7810
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
2483 frame_and_buffer_state = Fmake_vector (make_number (1), Qlambda); |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
2484 staticpro (&frame_and_buffer_state); |
15c0bf73737e
(Fframe_or_buffer_changed_p): New function.
Karl Heuer <kwzh@gnu.org>
parents:
7808
diff
changeset
|
2485 |
314 | 2486 DEFVAR_INT ("baud-rate", &baud_rate, |
7926
b87f2c705501
(syms_of_display): Make baud-rate a user var.
Richard M. Stallman <rms@gnu.org>
parents:
7900
diff
changeset
|
2487 "*The output baud rate of the terminal.\n\ |
314 | 2488 On most systems, changing this value will affect the amount of padding\n\ |
2489 and the other strategic decisions made during redisplay."); | |
2490 DEFVAR_BOOL ("inverse-video", &inverse_video, | |
764 | 2491 "*Non-nil means invert the entire frame display.\n\ |
314 | 2492 This means everything is in inverse video which otherwise would not be."); |
2493 DEFVAR_BOOL ("visible-bell", &visible_bell, | |
764 | 2494 "*Non-nil means try to flash the frame to represent a bell."); |
314 | 2495 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter, |
764 | 2496 "*Non-nil means no need to redraw entire frame after suspending.\n\ |
314 | 2497 A non-nil value is useful if the terminal can automatically preserve\n\ |
764 | 2498 Emacs's frame display when you reenter Emacs.\n\ |
314 | 2499 It is up to you to set this variable if your terminal can do that."); |
2500 DEFVAR_LISP ("window-system", &Vwindow_system, | |
2501 "A symbol naming the window-system under which Emacs is running\n\ | |
2502 \(such as `x'), or nil if emacs is running on an ordinary terminal."); | |
2503 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, | |
2504 "The version number of the window system in use.\n\ | |
2505 For X windows, this is 10 or 11."); | |
2506 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, | |
2507 "Non-nil means put cursor in minibuffer, at end of any message there."); | |
2508 DEFVAR_LISP ("glyph-table", &Vglyph_table, | |
764 | 2509 "Table defining how to output a glyph code to the frame.\n\ |
314 | 2510 If not nil, this is a vector indexed by glyph code to define the glyph.\n\ |
2511 Each element can be:\n\ | |
2512 integer: a glyph code which this glyph is an alias for.\n\ | |
2513 string: output this glyph using that string (not impl. in X windows).\n\ | |
2514 nil: this glyph mod 256 is char code to output,\n\ | |
6857 | 2515 and this glyph / 256 is face code for X windows (see `face-id')."); |
314 | 2516 Vglyph_table = Qnil; |
2517 | |
2518 DEFVAR_LISP ("standard-display-table", &Vstandard_display_table, | |
2519 "Display table to use for buffers that specify none.\n\ | |
2520 See `buffer-display-table' for more information."); | |
2521 Vstandard_display_table = Qnil; | |
2522 | |
2523 /* Initialize `window-system', unless init_display already decided it. */ | |
2524 #ifdef CANNOT_DUMP | |
2525 if (noninteractive) | |
2526 #endif | |
2527 { | |
2528 Vwindow_system = Qnil; | |
2529 Vwindow_system_version = Qnil; | |
2530 } | |
2531 } |